Version bump

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

7 files changed, 146 insertions, 178 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 6c7826bc334e..68e526d45fbc 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2009/09/09 16:15:44 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.9 2010/01/29 03:04:27 bicatali Exp $
+
+*wcslib-4.4.4 (29 Jan 2010)
+
+  29 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -wcslib-4.3-r1.ebuild, -wcslib-4.3.3-r1.ebuild,
+  -files/wcslib-4.3.3-flibs.patch, -files/wcslib-4.3.3-tests.patch,
+  -wcslib-4.4.2.ebuild, +wcslib-4.4.4.ebuild,
+  +files/wcslib-4.4.4-destdir.patch:
+  Version bump
 
 *wcslib-4.4.3 (09 Sep 2009)
 
diff --git a/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch b/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch
deleted file mode 100644
index 1f8590d49a94..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- pgsbox/GNUmakefile.orig	2009-07-16 18:25:15.000000000 +0100
-+++ pgsbox/GNUmakefile	2009-07-16 18:26:19.000000000 +0100
-@@ -118,7 +118,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-07-16 19:21:50.000000000 +0100
-+++ Fortran/GNUmakefile	2009-07-16 19:23:04.000000000 +0100
-@@ -181,25 +181,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 ../C/wcstab.fits getwcstab_f.o getwcstab.inc \
-           ../C/getwcstab.o $(LIBWCS)
- 	-@ echo ''
- 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< getwcstab_f.o \
--	     ../C/getwcstab.o $(LIBWCS) $(CFITSIOLIB) $(LIBS)
-+	     ../C/getwcstab.o $(LIBWCS) $(CFITSIOLIB) $(LIBS) $(FLIBS)
- 	-@ $(RM) $@.o
- 
- $(PGSBOXLIB) :
diff --git a/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch b/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch
deleted file mode 100644
index 02ea580c7e1a..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/GNUmakefile.orig	2009-08-11 17:13:16.000000000 +0100
-+++ C/GNUmakefile	2009-08-11 17:13:43.000000000 +0100
-@@ -137,7 +137,7 @@
- 	-@ echo ''
- 	-@ $(TIMER)
- 	 @ if [ '$<' = tcel2 ] ; then \
--	     echo N | $< ; \
-+	     echo N | ./$< ; \
- 	   elif [ '$<' = tunits ] ; then \
- 	     ./$< < test/units_test ; \
- 	   elif [ '$<' != twcshdr ] ; then \
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
new file mode 100644
index 000000000000..6d3d21c76957
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
@@ -0,0 +1,130 @@
+diff -Nur wcslib-4.4.4.orig/C/GNUmakefile wcslib-4.4.4/C/GNUmakefile
+--- wcslib-4.4.4.orig/C/GNUmakefile	2009-08-13 00:55:50.000000000 +0100
++++ wcslib-4.4.4/C/GNUmakefile	2010-01-29 02:48:25.000000000 +0000
+@@ -180,36 +180,36 @@
+ 	-@ echo ''
+ 	-@ $(RM) -r tmp
+ 	   mkdir tmp
+-	   cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) -o $@ *.o && mv $@ ..
++	   cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) $(LDFLAGS) -o $@ *.o && mv $@ ..
+ 	-  $(RM) -r tmp
+ 
+ $(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)
+diff -Nur wcslib-4.4.4.orig/Fortran/GNUmakefile wcslib-4.4.4/Fortran/GNUmakefile
+--- wcslib-4.4.4.orig/Fortran/GNUmakefile	2009-08-11 00:56:25.000000000 +0100
++++ wcslib-4.4.4/Fortran/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
+@@ -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)
+diff -Nur wcslib-4.4.4.orig/GNUmakefile wcslib-4.4.4/GNUmakefile
+--- wcslib-4.4.4.orig/GNUmakefile	2009-09-14 07:49:58.000000000 +0100
++++ wcslib-4.4.4/GNUmakefile	2010-01-29 02:32:59.000000000 +0000
+@@ -51,14 +51,13 @@
+ 	 @ for DIR in $(INSTDIR) ; do \
+ 	     $(MAKE) -k -C $$DIR $@ ; \
+ 	   done
+-	   $(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 -Nur wcslib-4.4.4.orig/pgsbox/GNUmakefile wcslib-4.4.4/pgsbox/GNUmakefile
+--- wcslib-4.4.4.orig/pgsbox/GNUmakefile	2009-08-11 00:57:05.000000000 +0100
++++ wcslib-4.4.4/pgsbox/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
+@@ -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 $@
+diff -Nur wcslib-4.4.4.orig/utils/GNUmakefile wcslib-4.4.4/utils/GNUmakefile
+--- wcslib-4.4.4.orig/utils/GNUmakefile	2009-08-10 09:56:04.000000000 +0100
++++ wcslib-4.4.4/utils/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
+@@ -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 ;
+ 
diff --git a/sci-astronomy/wcslib/wcslib-4.3-r1.ebuild b/sci-astronomy/wcslib/wcslib-4.3-r1.ebuild
deleted file mode 100644
index 01c97379f041..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.3-r1.ebuild,v 1.1 2008/12/08 11:58:10 bicatali Exp $
-
-inherit fortran eutils
-
-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.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-DEPEND="sci-libs/pgplot
-	sci-libs/cfitsio"
-
-FORTRAN="gfortran ifc g77"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \
-		C/GNUmakefile || die
-}
-
-src_install () {
-	# make install from makefile is buggy
-
-	dobin utils/{HPXcvt,fitshdr,wcsgrid} || die "dobin failed"
-
-	dolib.a C/libwcs-${PV}.a pgsbox/libpgsbox-${PV}.a || die
-	dolib.so C/libwcs.so.${PV} || die
-	dosym libwcs.so.${PV} /usr/$(get_libdir)/libwcs.so
-	dosym libwcs-${PV}.a /usr/$(get_libdir)/libwcs.a
-	dosym libpgsbox-${PV}.a /usr/$(get_libdir)/libpgsbox.a
-
-	insinto /usr/include/${P}
-	doins wcsconfig.h wcsconfig_f77.h || die
-	doins pgsbox/*.h C/*.h Fortran/*inc || die
-	dosym ${P} /usr/include/${PN}
-
-	dodoc README
-	newdoc C/CHANGES CHANGES_C
-	newdoc Fortran/CHANGES CHANGES_FORTRAN
-	newdoc pgsbox/CHANGES CHANGES_PGSBOX
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild
deleted file mode 100644
index f42ed7a99b29..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.3.3-r1.ebuild,v 1.3 2009/08/11 18:55:50 mr_bones_ 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.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="sci-libs/pgplot
-	sci-libs/cfitsio"
-DEPEND="${RDEPEND}
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-src_prepare() {
-	sed -i \
-		-e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \
-		C/GNUmakefile || die
-	epatch "${FILESDIR}"/${P}-flibs.patch
-	epatch "${FILESDIR}"/${P}-tests.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 -j1 check || die "emake test failed"
-}
-
-src_install () {
-	# make install from makefile is buggy
-	dobin utils/{HPXcvt,fitshdr,wcsgrid} || die "dobin failed"
-	WCSV=$(get_version_component_range 1-2)
-	dolib.a C/libwcs-${WCSV}.a pgsbox/libpgsbox-${WCSV}.a || die
-	dolib.so C/libwcs.so.${WCSV} || die
-	dosym libwcs.so.${WCSV} /usr/$(get_libdir)/libwcs.so
-	dosym libwcs-${WCSV}.a /usr/$(get_libdir)/libwcs.a
-	dosym libpgsbox-${WCSV}.a /usr/$(get_libdir)/libpgsbox.a
-
-	insinto /usr/include/${P}
-	doins wcsconfig.h wcsconfig_f77.h || die
-	doins pgsbox/*.h C/*.h Fortran/*inc || die
-	dosym ${P} /usr/include/${PN}
-
-	dodoc README
-	newdoc C/CHANGES CHANGES_C
-	newdoc Fortran/CHANGES CHANGES_FORTRAN
-	newdoc pgsbox/CHANGES CHANGES_PGSBOX
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.4.2.ebuild b/sci-astronomy/wcslib/wcslib-4.4.4.ebuild
index 70b2a4dc089a..f4072aada91a 100644
--- a/sci-astronomy/wcslib/wcslib-4.4.2.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.4.4.ebuild,v 1.1 2010/01/29 03:04:27 bicatali Exp $
 
 EAPI=2
-inherit eutils versionator virtualx flag-o-matic
+inherit eutils virtualx flag-o-matic
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -21,15 +21,9 @@ DEPEND="${RDEPEND}
 		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
+	epatch "${FILESDIR}"/${PN}-4.4.2-flibs.patch
+	epatch "${FILESDIR}"/${PN}-4.4.4-destdir.patch
 	append-flags -U_FORTIFY_SOURCE
 }