Version bump

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

8 files changed, 154 insertions, 191 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/Manifest b/sci-astronomy/wcslib/Manifest
index 0fa0e50ea788..506f2fd4b88a 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wcslib-4.3.3-flibs.patch 1534 RMD160 82098f98705eaad19d93f9e5889371e590cccbd9 SHA1 03d2e76bebb0e7aea783d5e8fbc95d58b0b2edc5 SHA256 deadaaaafdf34823253e9664a00b8079fe53a55312677d06c43d237942f8d10f
-AUX wcslib-4.3.3-tests.patch 352 RMD160 809f8882bf22d5c2cdf0324f8c9f414f9a5336ac SHA1 ffd9747dddd800807c69b88074815193d7c98eeb SHA256 4b1414c89da292403d3ffacfaba00edf9d3c3e48d2ef47d7557cee74ad65cad4
 AUX wcslib-4.4.2-destdir.patch 4438 RMD160 f7b43127cc299139cb63146ee74fe5eeda479183 SHA1 5977905f3b00ed3c10a07c38c622a84ed63121ac SHA256 1f537e2a73c22e7106b34739fa358e8add5f0c2f5049bdf7524de35dcd074b1c
 AUX wcslib-4.4.2-flibs.patch 1529 RMD160 c875e977f3b45d3a07faf7fb607de90c792df50f SHA1 2e0d73ff6f323cf65a35444f71486abccce23c9f SHA256 eb3916c4cef732e3d422599f05adf3eecfb38adb68db591951ed65f8ce60464e
-DIST wcslib-4.3.3.tar.gz 629037 RMD160 8aaf4544ecb756b374f1823da47825da38ea1704 SHA1 d575c2441fe9ffa3fa4a5ddfedecd8b648f93fe8 SHA256 24031144861085dc1e45cf0c2f3864eb40f259a65ab80a2ce547fd1baabc02de
-DIST wcslib-4.3.tar.gz 606393 RMD160 19b2f2aded2b0ba9841de4d9d7006247fb0619b9 SHA1 4d4370484c1db2159935d599eee6c7eb6d2adf7a SHA256 c8bd43840b1a76774728f3d32d3e79f02586f3b34b0051eb5a861236b23e549f
-DIST wcslib-4.4.2.tar.bz2 1622015 RMD160 ae0c71e922a02e196b7ee901b1a9ef9aecf5e5d1 SHA1 20393ef13fc6df7aad33dad18dfb08875fe6776f SHA256 69f0fdeaad494d24deb0820e6ab808f1e5d51250603ad558095c8e999eecc969
+AUX wcslib-4.4.4-destdir.patch 5190 RMD160 3f95bc8dbb1a36e572c75d4a6208fffa8be4d121 SHA1 87f7c035715f2af628f484abdf9468a18e0d1139 SHA256 2556744ff3d6e01cd447d9a774d20c882617c7a7a0dd8bc773c244c09a15b322
 DIST wcslib-4.4.3.tar.bz2 1591218 RMD160 7e97c90a5e518c52994413e52eb978bf0981e347 SHA1 2717a56605d300f5607a1a4a3be6a1f2a73936a9 SHA256 d67db82e528bca6a88fe7432fcd42b1647932c480c5f93736a1cab334639d6ee
-EBUILD wcslib-4.3-r1.ebuild 1331 RMD160 0c7e288f32e0661839802f8b0d286b4ec94c5a27 SHA1 bb18687a611e320b02d493680c15c4d43289d009 SHA256 06a95517496408edfecc13267da9812eb1156ab00212127572a4f07da05f908e
-EBUILD wcslib-4.3.3-r1.ebuild 1779 RMD160 db9e50d4e28971bb05ea6d11bc1af8342b28bad8 SHA1 649ba997e385a26dc197218d9b7b8ccf73a4ab0f SHA256 3109ccd1e9046f5ad8b667232337fc15464b3d5df7fe73379ce1826d9a6fd22f
-EBUILD wcslib-4.4.2.ebuild 1335 RMD160 f9b04fbfd2e6f094c15c4d1a54bb07a5ed888007 SHA1 76d0f8bf65292b833a1427f31319f327d0684c9e SHA256 e3f0608c6109556c57f076a4da071e99f447be47c919bea2e1e0502967de21fb
+DIST wcslib-4.4.4.tar.bz2 1590830 RMD160 f2349b099777cddaca71def9c3f65458b42e862c SHA1 ba65d95dc5ce0bdf562a3f96280b6505e9ee66ae SHA256 557ecab50af0cb84e4f18ca19eede3624d6538f22eb580bd5a67f78f7d65ebaa
 EBUILD wcslib-4.4.3.ebuild 1267 RMD160 1ef98922785e19a3e297e7bea1c44fbe1a865439 SHA1 7c1015598901d0c05804cd95dc2feed0a7ac87f6 SHA256 4a1f225f84ece718e10fe05b48284da86b1e895a239263c6d445d009bf3a2ad0
-MISC ChangeLog 1600 RMD160 4734a35741355a0061cebb1bae009359c751bc9c SHA1 fe7e60390928131a8f75322b4489d6e34fbce990 SHA256 c8ddea43ac2a9f7d2b7d7cd7edb41bba35febc6cb81a74ce78c1e1a994ff3979
+EBUILD wcslib-4.4.4.ebuild 1193 RMD160 6f79ca63f637020341c964a6dc2c6cfe8b514ec2 SHA1 804a129bb5a91560db2832052be6f2136314ce21 SHA256 17b0b363bfb3d3f8a29d144fea983f40df8a600e6fbcaf45e95757dc1a528049
+MISC ChangeLog 1901 RMD160 9e3a172c0b80bb6422469b03a16eee69a7bdf916 SHA1 ea39426b6c7f8c1ab1ad4bf87d4a502fcf557598 SHA256 9620f7213fa82ae40c4e1bd5ab4317848aa6ed618277a37c0b41fe0c9f660684
 MISC metadata.xml 526 RMD160 b4130ef4285e199d5c07d9848f095c138b7e5d39 SHA1 17a684cec86c065cec536197709034dcc6a8ae80 SHA256 4819cc3667c7460268fe9ada14c4c69606d30335d6a249da471d5c598b5c1e9e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkqn1LsACgkQ1ycZbhPLE2BHcACgpaVVkCWhytz7+6ReEu6JthWU
-B10AnRIyalKZaXlOqLPbVErfxfh0CETR
-=NxT7
+iEYEARECAAYFAktiUEQACgkQ1ycZbhPLE2Ag2gCfUJDc+w/bsz9HErQqNkoRWfht
+2fEAnRSmclMlq11IAn51rfqjtS+LGDqH
+=VZqq
 -----END PGP SIGNATURE-----
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
 }