diff options
| -rw-r--r-- | sci-astronomy/wcslib/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-astronomy/wcslib/Manifest | 13 | ||||
| -rw-r--r-- | sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch | 43 | ||||
| -rw-r--r-- | sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild (renamed from sci-astronomy/wcslib/wcslib-4.3.3.ebuild) | 18 |
4 files changed, 66 insertions, 16 deletions
diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog index b33a328cc5b6..83ca0aa9b5d9 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.4 2009/06/26 21:49:49 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.5 2009/07/16 18:46:27 bicatali Exp $ + +*wcslib-4.3.3-r1 (16 Jul 2009) + + 16 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> -wcslib-4.3.3.ebuild, + +wcslib-4.3.3-r1.ebuild, +files/wcslib-4.3.3-flibs.patch: + Fixed linking problem (bug #275804) and added a patch for tests *wcslib-4.3.3 (26 Jun 2009) diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest index 28a194b3b5ff..be61906a762c 100644 --- a/sci-astronomy/wcslib/Manifest +++ b/sci-astronomy/wcslib/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX wcslib-4.3.3-flibs.patch 1534 RMD160 82098f98705eaad19d93f9e5889371e590cccbd9 SHA1 03d2e76bebb0e7aea783d5e8fbc95d58b0b2edc5 SHA256 deadaaaafdf34823253e9664a00b8079fe53a55312677d06c43d237942f8d10f 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 EBUILD wcslib-4.3-r1.ebuild 1331 RMD160 0c7e288f32e0661839802f8b0d286b4ec94c5a27 SHA1 bb18687a611e320b02d493680c15c4d43289d009 SHA256 06a95517496408edfecc13267da9812eb1156ab00212127572a4f07da05f908e -EBUILD wcslib-4.3.3.ebuild 1492 RMD160 636dc7c2c8f2efac09fca13832253e43b886e253 SHA1 7a376b8a29bf8d2c43bdc8f6e245dcb1910be6f8 SHA256 6a0c4a2fc755306e7551c6edbc02f88747cf8abb4fd2360dc56f9ad94582b200 -MISC ChangeLog 750 RMD160 158762fb1bd80cfdd84ea02381cfed98d235a308 SHA1 66816ccab74dd2d87eacdf30108f4fd4c695fe95 SHA256 4623c502cfb058d793916c1309594b70ccf30c88446ce0266fc6ef62a29f5ba8 +EBUILD wcslib-4.3.3-r1.ebuild 1597 RMD160 e6f5ded9b72dc41ea7f4db02c150614918a5798e SHA1 a203e7a7118317f8526ad9b80ca6a998f959a49a SHA256 fd9ddccafee21e81decc91533026bae8093f2f22a0c0a932cbd7860038fef64c +MISC ChangeLog 986 RMD160 46dbe47e8e9ebe046175a9f9c793a9074ce5ea92 SHA1 3cefc829a325f344be706df1d85c250f1e9266dd SHA256 4b1620a51e9a71f4ea79ee111786109b329466190115908fead59f2d55bad11a MISC metadata.xml 526 RMD160 b4130ef4285e199d5c07d9848f095c138b7e5d39 SHA1 17a684cec86c065cec536197709034dcc6a8ae80 SHA256 4819cc3667c7460268fe9ada14c4c69606d30335d6a249da471d5c598b5c1e9e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.12 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEUEARECAAYFAkpFQogACgkQ1ycZbhPLE2D3bQCdGncNwW1p7ajkVxeCj8oHZsXJ -mF0AliTBuhdM8gUzf1k/M9zg2zqpGE4= -=uqYJ +iEYEARECAAYFAkpfdY0ACgkQ1ycZbhPLE2AHxgCfSkmIxbudMfILqgRdMW4oVCcm +yr4AnRcntijaRwjy5v7ZlYY+NzcqkeXk +=EZrC -----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 new file mode 100644 index 000000000000..1f8590d49a94 --- /dev/null +++ b/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch @@ -0,0 +1,43 @@ +--- 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/wcslib-4.3.3.ebuild b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild index 1770231eacd5..d98ca7c65c17 100644 --- a/sci-astronomy/wcslib/wcslib-4.3.3.ebuild +++ b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild @@ -1,9 +1,9 @@ # 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.ebuild,v 1.1 2009/06/26 21:49:49 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild,v 1.1 2009/07/16 18:46:27 bicatali Exp $ EAPI=2 -inherit eutils +inherit eutils versionator DESCRIPTION="Astronomical World Coordinate System transformations library" HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/" @@ -22,6 +22,8 @@ src_prepare() { sed -i \ -e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \ C/GNUmakefile || die + WCSV=$(get_version_component_range 1-2) + epatch "${FILESDIR}"/${P}-flibs.patch } src_compile() { @@ -35,14 +37,12 @@ rc_install() { 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 + 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 |