Version bump, with documentation. New patch for respecting DESDIR

(Portage version: 2.2_rc38/cvs/Linux x86_64)

4 files changed, 221 insertions, 1 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 41f947c1a267..742592206acb 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.6 2009/08/11 17:57:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.7 2009/08/17 19:55:27 bicatali Exp $
+
+*wcslib-4.4.2 (17 Aug 2009)
+
+  17 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> +wcslib-4.4.2.ebuild,
+  +files/wcslib-4.4.2-destdir.patch, +files/wcslib-4.4.2-flibs.patch:
+  Version bump, with documentation. New patch for respecting DESDIR
 
   11 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
   wcslib-4.3.3-r1.ebuild, +files/wcslib-4.3.3-tests.patch:
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
new file mode 100644
index 000000000000..54a24d6e5db5
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
@@ -0,0 +1,118 @@
+--- ./C/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
++++ ./C/GNUmakefile	2009-08-17 20:40:01.000000000 +0100
+@@ -186,30 +186,30 @@
+ $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
+ 
+ install : build
+-	-  if [ ! -d "$(LIBDIR)" ] ; then \
+-	     $(INSTALL) -d -m 2775 $(LIBDIR) ; \
++	-  if [ ! -d "$(DESTDIR)$(LIBDIR)" ] ; then \
++	     $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR) ; \
+ 	   fi
+-	   $(INSTALL) -m 644 $(LIBWCS) $(LIBDIR)
+-	   $(RANLIB) $(LIBDIR)/$(LIBWCS)
+-	-  if [ -L "$(LIBDIR)/libwcs.a" ] ; then \
+-	     $(RM) $(LIBDIR)/libwcs.a ; \
++	   $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR)
++	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS)
++	-  if [ -L "$(DESTDIR)$(LIBDIR)/libwcs.a" ] ; then \
++	     $(RM) $(DESTDIR)$(LIBDIR)/libwcs.a ; \
+ 	   fi
+-	   $(LN_S) $(LIBWCS) $(LIBDIR)/libwcs.a
++	   $(LN_S) $(LIBWCS) $(DESTDIR)$(LIBDIR)/libwcs.a
+ 	-  if [ "$(SHRLIB)" != "" ] ; then \
+-	     $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \
++	     $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \
+ 	     if [ "$(SHRLN)" != "" ] ; then \
+-	       if [ -L "$(LIBDIR)/$(SHRLN)" ] ; then \
+-	         $(RM) $(LIBDIR)/$(SHRLN) ; \
++	       if [ -L "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \
++	         $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
+ 	       fi ; \
+-	       $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \
++	       $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
+ 	     fi ; \
+ 	   fi
+-	-  if [ ! -d "$(INCDIR)" ] ; then \
+-	     $(INSTALL) -d -m 2775 $(INCDIR) ; \
++	-  if [ ! -d "$(DESTDIR)$(INCDIR)" ] ; then \
++	     $(INSTALL) -d -m 2775 $(DESTDIR)$(INCDIR) ; \
+ 	   fi
+-	   $(INSTALL) -m 444 *.h $(INCDIR)
+-	   $(RM) $(INCLINK)
+-	   $(LN_S) $(WCSLIBV) $(INCLINK)
++	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
++	   $(RM) $(DESTDIR)$(INCLINK)
++	   $(LN_S) $(WCSLIBV) $(DESTDIR)$(INCLINK)
+ 
+ clean :
+ 	- $(RM) *.o *.i a.out core $(EXTRA_CLEAN)
+--- ./utils/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
++++ ./utils/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
+@@ -101,10 +101,10 @@
+ 	   $(MAKE) -C ../C lib
+ 
+ install : build
+-	-  if [ ! -d "$(BINDIR)" ] ; then \
+-	     $(INSTALL) -d -m 2775 $(BINDIR) ; \
++	-  if [ ! -d "$(DESTDIR)$(BINDIR)" ] ; then \
++	     $(INSTALL) -d -m 2775 $(DESTDIR)$(BINDIR) ; \
+ 	   fi
+-	   $(INSTALL) -m 755 $(UTILS) $(BINDIR)
++	   $(INSTALL) -m 755 $(UTILS) $(DESTDIR)$(BINDIR)
+ 
+ GNUmakefile : ../makedefs ;
+ 
+--- ./Fortran/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
++++ ./Fortran/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
+@@ -177,7 +177,7 @@
+ 
+ install : build
+ 	$(MAKE) -C ../C install
+-	$(INSTALL) -m 444 *.inc $(INCDIR)
++	$(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR)
+ 
+ clean :
+ 	- $(RM) *.o *.i a.out core fort.* $(EXTRA_CLEAN)
+--- ./pgsbox/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
++++ ./pgsbox/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
+@@ -128,11 +128,11 @@
+ 
+ install : build
+ 	   $(MAKE) -C ../Fortran install
+-	   $(INSTALL) -m 644 $(PGSBOXLIB) $(LIBDIR)
+-	   $(RANLIB) $(LIBDIR)/$(PGSBOXLIB)
+-	   $(RM) $(LIBDIR)/libpgsbox.a
+-	   $(LN_S) $(LIBDIR)/$(PGSBOXLIB) $(LIBDIR)/libpgsbox.a
+-	   $(INSTALL) -m 444 *.h $(INCDIR)
++	   $(INSTALL) -m 644 $(PGSBOXLIB) $(DESTDIR)$(LIBDIR)
++	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB)
++	   $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a
++	   $(LN_S) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB) $(DESTDIR)$(LIBDIR)/libpgsbox.a
++	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
+ 
+ pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
+ 	-@ rm -f $@
+--- ./GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
++++ ./GNUmakefile	2009-08-17 20:38:45.000000000 +0100
+@@ -76,14 +76,13 @@
+ install :
+ 	$(MAKE) -k -C $(INSTDIR) $@
+ 	$(MAKE) -k -C utils $@
+-	$(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR)
+-	$(INSTALL) -m 444 CHANGES $(INCDIR)/CHANGES
+-	$(INSTALL) -m 444 COPYING $(INCDIR)/COPYING
+-	$(INSTALL) -m 444 README  $(INCDIR)/README
+-	if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
+-	  $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \
++	$(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(DESTDIR)$(INCDIR)
++	$(INSTALL) -m 444 CHANGES $(DESTDIR)$(INCDIR)/CHANGES
++	$(INSTALL) -m 444 README  $(DESTDIR)$(INCDIR)/README
++	if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \
++	  $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \
+ 	fi
+-	$(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
++	$(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc
+ 
+ realclean cleanest :
+ 	for DIR in $(SUBDIRS) doxygen ; do \
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch b/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch
new file mode 100644
index 000000000000..791a8f0e62d8
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch
@@ -0,0 +1,43 @@
+--- pgsbox/GNUmakefile.orig	2009-08-11 00:57:05.000000000 +0100
++++ pgsbox/GNUmakefile	2009-08-17 19:00:42.000000000 +0100
+@@ -136,7 +136,7 @@
+ 
+ pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
+ 	-@ rm -f $@
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(PGPLOTLIB) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 
+ cpgtest : cpgtest.c lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
+ 	-@ rm -f $@
+--- Fortran/GNUmakefile.orig	2009-08-11 00:56:25.000000000 +0100
++++ Fortran/GNUmakefile	2009-08-17 19:03:25.000000000 +0100
+@@ -196,25 +196,25 @@
+ 
+ $(TEST_N) : % : test/%.f $(LIBWCS)
+ 	-@ echo ''
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ $(TEST_P) : % : test/%.f $(LIBWCS)
+ 	-@ echo ''
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(PGPLOTLIB) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ tpih2 : % : test/%.f $(PGSBOXLIB) $(LIBWCS)
+ 	-@ echo ''
+ 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(PGSBOXLIB) $(LIBWCS) \
+-	     $(PGPLOTLIB) $(LIBS)
++	     $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ twcstab : test/twcstab.f getwcstab_f.o getwcstab.inc $(FGETWCSTAB) \
+     $(LIBWCS)
+ 	-@ echo ''
+ 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< getwcstab_f.o \
+-	     $(FGETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(LIBS)
++	     $(FGETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ getwcstab_f.o : getwcstab_f.c getwcstab.h
diff --git a/sci-astronomy/wcslib/wcslib-4.4.2.ebuild b/sci-astronomy/wcslib/wcslib-4.4.2.ebuild
new file mode 100644
index 000000000000..70b2a4dc089a
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-4.4.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.4.2.ebuild,v 1.1 2009/08/17 19:55:27 bicatali Exp $
+
+EAPI=2
+inherit eutils versionator virtualx flag-o-matic
+
+DESCRIPTION="Astronomical World Coordinate System transformations library"
+HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
+SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="sci-libs/pgplot
+	sci-libs/cfitsio"
+DEPEND="${RDEPEND}
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+WCSV=$(get_version_component_range 1-2)
+S="${WORKDIR}/${PN}-${WCSV}"
+
+src_prepare() {
+	sed -i \
+		-e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \
+		C/GNUmakefile || die
+	epatch "${FILESDIR}"/${P}-flibs.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	append-flags -U_FORTIFY_SOURCE
+}
+
+src_compile() {
+	# -j1 forced. build system too crappy to be worth debugging
+	# does not really fix anything
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	Xemake check || die "emake test failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r *.pdf html || die
+	fi
+}