Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sci-astronomy/wcslib/ChangeLog13
-rw-r--r--sci-astronomy/wcslib/Manifest21
-rw-r--r--sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch118
-rw-r--r--sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch43
-rw-r--r--sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch130
-rw-r--r--sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch13
-rw-r--r--sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch26
-rw-r--r--sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild50
-rw-r--r--sci-astronomy/wcslib/wcslib-4.7.ebuild (renamed from sci-astronomy/wcslib/wcslib-4.5.4.ebuild)18
9 files changed, 23 insertions, 409 deletions
diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 0cb8654b5893..492c93676e20 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sci-astronomy/wcslib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.14 2010/12/10 05:58:08 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.15 2011/02/17 06:38:50 bicatali Exp $
+
+*wcslib-4.7 (17 Feb 2011)
+
+ 17 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org>
+ -files/wcslib-4.4.2-destdir.patch, -files/wcslib-4.4.2-flibs.patch,
+ -wcslib-4.4.4-r1.ebuild, -files/wcslib-4.4.4-destdir.patch,
+ -files/wcslib-4.4.4-ldflags.patch, -files/wcslib-4.5.3-fortran.patch,
+ -wcslib-4.5.4.ebuild, +wcslib-4.7.ebuild:
+ Version bump. Patches applied upstream.
*wcslib-4.6.3 (10 Dec 2010)
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index e28ff02b93b3..f4a8287f7424 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,26 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-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
-AUX wcslib-4.4.4-destdir.patch 5170 RMD160 1c69fc528dfb2aeb48cd03e4c015593151475bff SHA1 d5f05af03c37d0fc1fe32dcf84f76e4d58512bf8 SHA256 e2a2d60c7073e7af06d2efbe81bf8361cb7ef0c8e2e4055497c18021d566102d
-AUX wcslib-4.4.4-ldflags.patch 367 RMD160 46afad5f889fa568c4610c824dfff907cc9462d0 SHA1 ccd626dcbc69263146569d8dc5a78d3444e7116f SHA256 f3e9aba58aac52e5930f0a03585d2f5f9777c15852d61d8dd8aeaaaa8b50ac13
-AUX wcslib-4.5.3-fortran.patch 868 RMD160 9fdc8276f17faf0c1156d3ffeeb2f20ea8821e38 SHA1 153127015d5bcc25f50050e793c5542a8b0e9800 SHA256 81cdab8508c6b6787d2d9b567b96a2e7c2b927a5ca2449d0cadc31ea9dcffd48
AUX wcslib-4.6.3-autoconf.patch 1366 RMD160 2b1e2ca633e76e8caf36ca5c3d45b36f892fc549 SHA1 bdeefccfc7c58214d7923aed2ea964b140b0a742 SHA256 8d8bad1a1ac56b8f7b9e412c90c799dceaa037c6924e91f703ac1498b5174437
AUX wcslib-4.6.3-destdir.patch 6356 RMD160 30b9a0faf4b17d43a8f87a30c5bccb1384b120d1 SHA1 9d5e9addbdc9fef137e4175a69dc662735a83a67 SHA256 ffa853bfb692a7f5a825d00f3a85ace3cf6cdce2eb6118e384b788c4650601d7
AUX wcslib-4.6.3-ldflags.patch 970 RMD160 390bc76317913fe53e8049c2b88648f625b5198e SHA1 79acf7138761fcb20ca2df52c4ab359f8f4fe6ce SHA256 bbc0ffab7a66b6581d4de51d6eb19246205dfb6c79ec0c33519ef80528f6e1e7
-DIST wcslib-4.4.4.tar.bz2 1590830 RMD160 f2349b099777cddaca71def9c3f65458b42e862c SHA1 ba65d95dc5ce0bdf562a3f96280b6505e9ee66ae SHA256 557ecab50af0cb84e4f18ca19eede3624d6538f22eb580bd5a67f78f7d65ebaa
-DIST wcslib-4.5.4.tar.bz2 1551438 RMD160 ddf25e56b29882b97ba44e2b5560c0807f1edcd2 SHA1 342d535e21c2750a7d1058a4137190b0d3701b2f SHA256 a851d6e7f4512578a0e4629a0f111e4a0b9c2b90bcb3874578681f9de08a1790
DIST wcslib-4.6.3.tar.bz2 1554152 RMD160 aaeab839c9c21c60b7ddd4f1520bd6d44a43e79e SHA1 f087079a9e7d0d886d63f814ee85934102d4b62a SHA256 a545005befe67967fb8641d6bc7d7e7c275954ab272e84e3974066a4199505f1
-EBUILD wcslib-4.4.4-r1.ebuild 1251 RMD160 4a05cf7754ea4a134f738556f8e60a561843520b SHA1 7f06773fa9bfdc7d5035bf77339abd8cb6a96ea2 SHA256 0e3b44c203400dd5b04a9b935017ee60bb8e3477f5bb1edcac57d540f79b8548
-EBUILD wcslib-4.5.4.ebuild 1356 RMD160 c4ddf7f7544b3f94daa95b46a172546eaea160a0 SHA1 05ba9a59f24ae0142af6998b11a058fa57246d38 SHA256 48dbf11a82261261d1fb474ae71089452bcaead332459a62bfc7b2b3d41146cb
+DIST wcslib-4.7.tar.bz2 1569962 RMD160 071ca016684cdfb1b23738532f10155c11ec62af SHA1 8cef9943381367aa938ce45b8eacf51ca57ce851 SHA256 9d7df14cc7f1ce5a3821031bd0e33f03f58862b904fe9274b30b0ab1a8a34c2a
EBUILD wcslib-4.6.3.ebuild 1361 RMD160 20e0c4b6df72ee868a888d124b261dfc81024727 SHA1 0698275298dc04d193c8249f941fa986377b270b SHA256 b89f105011183f159487e184b24c69c6e1d9e9785b5bce8f660a867763c6cdc9
-MISC ChangeLog 2928 RMD160 abc0578953edc541375a7081d66946ef8122e170 SHA1 514b3bc7be98d086a9ccc25e6e2239bfddca0d2a SHA256 8242cfff81e5feb90920d72014c1162075b3c1ec2f82e16c503f10fd27346b89
+EBUILD wcslib-4.7.ebuild 1119 RMD160 61e620a56c8175776caefa650bf44d400e4a5641 SHA1 03bc8f07c2e5d97d9f4ffc57283f4ad874fa40fd SHA256 d62edbbdea1374928c0153b9cc97830039f61b2fb4e7a9ed272624bbea9b315f
+MISC ChangeLog 3301 RMD160 afbdc8c6ffdcb91d28cdf14bd40d25b72cd9fdd2 SHA1 e40719d834f472d4b580ed95bc8ebc352e79e105 SHA256 6d6156ff3938ba7dad324e38c250b371384806245800be99e2ec68b3894f00f5
MISC metadata.xml 742 RMD160 2d6d181c32accd9116f5c29812d74e0b65df6f1e SHA1 bfd5ec4164079dcf73f576567c8d5d579fd53bf6 SHA256 db4dd208778223b3ce2fb7672ac5364b96735305472ab4bfb858e69c93532925
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk0BwhYACgkQ1ycZbhPLE2B93gCdHClwcYdI4pe4l6G8IWICQpo3
-dAwAoI/Iv4SUwkLg/BxlEgikoWIfsT4U
-=EWt8
+iEYEARECAAYFAk1cwoMACgkQ1ycZbhPLE2DjBgCfVRNmXaQ0e+N4ftmdXkWbIZm4
+FfcAniXQxHkD82r/LQ/VUQ5iI5akXCCR
+=n2PN
-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
deleted file mode 100644
index 54a24d6e5db5..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- ./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
deleted file mode 100644
index 791a8f0e62d8..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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/files/wcslib-4.4.4-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
deleted file mode 100644
index 96374e992341..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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) $(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/files/wcslib-4.4.4-ldflags.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch
deleted file mode 100644
index f227bb8b8841..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Fortran/GNUmakefile b/Fortran/GNUmakefile
-index 6a9600d..94c33a3 100644
---- a/Fortran/GNUmakefile
-+++ b/Fortran/GNUmakefile
-@@ -169,7 +169,7 @@ $(SHRLIB) : $(PICLIB)
- mkdir tmp
- cd tmp && \
- $(AR) x ../$(PICLIB) && \
-- $(SHRLD) -o $(@F) *.o && \
-+ $(SHRLD) $(LDFLAGS) -o $(@F) *.o && \
- mv $(@F) ../../C
- - $(RM) -r tmp
-
diff --git a/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch b/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
deleted file mode 100644
index 2121bd2945ae..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.ac.orig 2010-09-23 21:30:25.000000000 +0000
-+++ configure.ac 2010-09-23 21:31:40.000000000 +0000
-@@ -145,11 +145,8 @@
- # F77=no configure ...bash
- AC_ARG_ENABLE([fortran], [AS_HELP_STRING([--disable-fortran],
- [don't build the Fortran wrappers or PGSBOX])], [])
--if test "x$enable_fortran" != x ; then
-- F77="$enable_fortran"
--fi
-
--if test "x$F77" = xno ; then
-+if test "x$enable_fortran" = xno ; then
- F77=
-
- SUBDIRS="C"
---- configure.ac.orig 2010-09-23 23:23:47.000000000 +0100
-+++ configure.ac 2010-09-23 23:26:41.000000000 +0100
-@@ -13,7 +13,7 @@
- AC_PREREQ([2.53])
- AC_REVISION([$Revision: 1.1 $])
- AC_SUBST([PACKAGE_VERSION])
--AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [$PACKAGE_VERSION])
-+AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [PACKAGE_VERSION], [Description])
-
- AC_CONFIG_SRCDIR([C/wcs.h])
- AC_CONFIG_AUX_DIR([config])
diff --git a/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild b/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild
deleted file mode 100644
index f2a4110b3cd3..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2010/05/22 07:30:37 jlec Exp $
-
-EAPI=2
-inherit eutils 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/cfitsio
- sci-libs/pgplot"
-DEPEND="${RDEPEND}
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.4.2-flibs.patch
- epatch "${FILESDIR}"/${PN}-4.4.4-destdir.patch
- epatch "${FILESDIR}"/${PN}-4.4.4-ldflags.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 || die
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins -r *.pdf html || die
- fi
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.5.4.ebuild b/sci-astronomy/wcslib/wcslib-4.7.ebuild
index 9505f1673a5c..695f6f35b33f 100644
--- a/sci-astronomy/wcslib/wcslib-4.5.4.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.5.4.ebuild,v 1.1 2010/10/10 01:27:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.7.ebuild,v 1.1 2011/02/17 06:38:50 bicatali Exp $
-EAPI=2
-inherit eutils virtualx flag-o-matic autotools
+EAPI=3
+inherit eutils virtualx
DESCRIPTION="Astronomical World Coordinate System transformations library"
HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -20,22 +20,15 @@ DEPEND="${RDEPEND}
test? ( media-fonts/font-misc-misc
media-fonts/font-cursor-misc )"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.4.4-destdir.patch
- epatch "${FILESDIR}"/${PN}-4.4.4-ldflags.patch
- epatch "${FILESDIR}"/${PN}-4.5.3-fortran.patch
- eautoreconf
-}
-
src_configure() {
econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
$(use_enable fortran) \
$(use_with fits cfitsio) \
$(use_with pgplot)
}
src_compile() {
- # -j1 forced. build system too crappy to be worth debugging
emake -j1 || die "emake failed"
}
@@ -45,7 +38,6 @@ src_test() {
src_install () {
emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README || die
if use doc; then
insinto /usr/share/doc/${PF}
doins -r *.pdf html || die