diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2011-08-18 05:45:59 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2011-08-18 05:45:59 +0000 |
commit | 81ed751ac440adc56ada2a5dfbeaaceac6da6fd5 (patch) | |
tree | 375534961af20573a3c11caa4c830672ff1b8c0a | |
parent | Move from gnome overlay for GNOME 3 (diff) | |
download | historical-81ed751ac440adc56ada2a5dfbeaaceac6da6fd5.tar.gz historical-81ed751ac440adc56ada2a5dfbeaaceac6da6fd5.tar.bz2 historical-81ed751ac440adc56ada2a5dfbeaaceac6da6fd5.zip |
Version bump. Remove old. Now does not need X display for testing anymore
Package-Manager: portage-2.1.10.10/cvs/Linux x86_64
-rw-r--r-- | sci-astronomy/wcslib/ChangeLog | 9 | ||||
-rw-r--r-- | sci-astronomy/wcslib/Manifest | 17 | ||||
-rw-r--r-- | sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch | 46 | ||||
-rw-r--r-- | sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch | 160 | ||||
-rw-r--r-- | sci-astronomy/wcslib/files/wcslib-4.6.3-ldflags.patch | 24 | ||||
-rw-r--r-- | sci-astronomy/wcslib/wcslib-4.8.ebuild (renamed from sci-astronomy/wcslib/wcslib-4.6.3.ebuild) | 43 |
6 files changed, 30 insertions, 269 deletions
diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog index b0f58466f3e6..4ed227fc673c 100644 --- a/sci-astronomy/wcslib/ChangeLog +++ b/sci-astronomy/wcslib/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-astronomy/wcslib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.18 2011/08/04 18:33:59 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.19 2011/08/18 05:45:59 bicatali Exp $ + +*wcslib-4.8 (18 Aug 2011) + + 18 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> -wcslib-4.6.3.ebuild, + -files/wcslib-4.6.3-autoconf.patch, -files/wcslib-4.6.3-destdir.patch, + -files/wcslib-4.6.3-ldflags.patch, +wcslib-4.8.ebuild: + Version bump. Remove old. Now does not need X display for testing anymore 04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml: Switched herd to sci-astronomy diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest index df8831319597..d3cc433d02e5 100644 --- a/sci-astronomy/wcslib/Manifest +++ b/sci-astronomy/wcslib/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -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.6.3.tar.bz2 1554152 RMD160 aaeab839c9c21c60b7ddd4f1520bd6d44a43e79e SHA1 f087079a9e7d0d886d63f814ee85934102d4b62a SHA256 a545005befe67967fb8641d6bc7d7e7c275954ab272e84e3974066a4199505f1 DIST wcslib-4.7.tar.bz2 1569962 RMD160 071ca016684cdfb1b23738532f10155c11ec62af SHA1 8cef9943381367aa938ce45b8eacf51ca57ce851 SHA256 9d7df14cc7f1ce5a3821031bd0e33f03f58862b904fe9274b30b0ab1a8a34c2a -EBUILD wcslib-4.6.3.ebuild 1451 RMD160 85cf02ae47d7544af9a4f3a37f7c6b04292ea2a1 SHA1 8d1cce59b3d71e27043509f6e45e3211e4343331 SHA256 b1990a65839dfcea9eb4dfd154e4ec3afcf6e026a92674cfd1fce96904057128 +DIST wcslib-4.8.tar.bz2 1755301 RMD160 15dc5cf9f1078ec8fe5f70c0340725ef751ed467 SHA1 6add3e991312a887f491174b953477509d3f13ff SHA256 41c80f9766b736f07a3ac799af6b3c7ede8ae5fc74e9217207b34fb30c7c90be EBUILD wcslib-4.7.ebuild 1212 RMD160 872c1ab7ca689b4c87b118ef2645736f2dccf1bf SHA1 f8ec12c59c6d0793edc732651b77b06cbfecccda SHA256 659ac92ce247c8de01a5076b37c966ba18d17ce904f434cd36eee864a236e2d1 -MISC ChangeLog 3653 RMD160 1c725624fe4e836a5f0651ed9d39de13eb08908a SHA1 76742bb2b949863a7776b0391729571d230002c9 SHA256 61ea7c2b7496053e613a30eea97ac7c9a514eb5b07c97680a6b8100f3820dedb +EBUILD wcslib-4.8.ebuild 1230 RMD160 3829e0606dc884c2b1bf3ad515fd7c75b5620c68 SHA1 cd4ca1e472c37a10fd222f20b3c05d5fee3164a6 SHA256 cbdb69ea86a9a90564b292e7e5c1992920b45efcc236d5f0e6a6af53fab7090b +MISC ChangeLog 3964 RMD160 645e46063489c15997a592f27c2d8bc8c120724c SHA1 33758918fb57c9b2033b14ba49ca3adfdc02024a SHA256 f92c74be535afa84adb5d5953e7582e9248e5573ae7ca3162051bc60f022fc59 MISC metadata.xml 752 RMD160 d8f05a4fec7495cc796ffec89ffa5bbf11e9e198 SHA1 a3481263806ad61923d5d9a837126dccc11d727d SHA256 ff8e4736cef8416a7771c3a7a6a8c970ab475d6ceff4194398251b57e3b02253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk465h8ACgkQ1ycZbhPLE2CuXwCfRrWn6fHDB6qT+rp9NoUR63ZK -H5gAoKPjRCOCs4/V0faIx+9wXM/k9w+R -=0wTi +iEYEARECAAYFAk5MpyAACgkQ1ycZbhPLE2BnfwCgkJ4cAsRJZm7GxAdRC/4slRJS +6msAnjTzKYkkkeKEFlJD0I2OGT7VpeT3 +=mnOK -----END PGP SIGNATURE----- diff --git a/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch deleted file mode 100644 index f70ac002e774..000000000000 --- a/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur wcslib-4.6.3.orig/configure.ac wcslib-4.6.3/configure.ac ---- wcslib-4.6.3.orig/configure.ac 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/configure.ac 2010-12-10 05:41:05.000000000 +0000 -@@ -15,7 +15,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], [Define wcslib version]) - - AC_CONFIG_SRCDIR([C/wcs.h]) - AC_CONFIG_AUX_DIR([config]) -@@ -147,11 +147,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" -@@ -208,7 +205,11 @@ - - SUBDIRS="C Fortran" - TSTDIRS="C Fortran" -- INSTDIR="pgsbox" -+ if test "x$PGPLOTINC" != x; then -+ INSTDIR="pgsbox" -+ else -+ INSTDIR="Fortran" -+ fi - fi - fi - -@@ -491,6 +492,6 @@ - # Do it. - AC_MSG_NOTICE([Configuring files...]) - AC_CONFIG_FILES([makedefs wcslib.pc]) --AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h \ -+AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h - wcsconfig_utils.h]) - AC_OUTPUT diff --git a/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch deleted file mode 100644 index 9a7f6a7d4bc7..000000000000 --- a/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -Nur wcslib-4.6.3.orig/C/GNUmakefile wcslib-4.6.3/C/GNUmakefile ---- wcslib-4.6.3.orig/C/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/C/GNUmakefile 2010-12-10 04:11:54.000000000 +0000 -@@ -177,30 +177,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 [ -h "$(LIBDIR)/libwcs.a" ] ; then \ -- $(RM) $(LIBDIR)/libwcs.a ; \ -+ $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR) -+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS) -+ - if [ -h "$(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 [ -h "$(LIBDIR)/$(SHRLN)" ] ; then \ -- $(RM) $(LIBDIR)/$(SHRLN) ; \ -+ if [ -h "$(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) -r *.o *.i a.out core *.dSYM $(EXTRA_CLEAN) -diff -Nur wcslib-4.6.3.orig/Fortran/GNUmakefile wcslib-4.6.3/Fortran/GNUmakefile ---- wcslib-4.6.3.orig/Fortran/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/Fortran/GNUmakefile 2010-12-10 04:11:54.000000000 +0000 -@@ -180,7 +180,7 @@ - - install : build - $(MAKE) -C ../C install -- $(INSTALL) -m 444 *.inc $(INCDIR) -+ $(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR) - - clean : - - $(RM) -r *.o *.i a.out core fort.* *.dSYM $(EXTRA_CLEAN) -diff -Nur wcslib-4.6.3.orig/GNUmakefile wcslib-4.6.3/GNUmakefile ---- wcslib-4.6.3.orig/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/GNUmakefile 2010-12-10 05:12:54.000000000 +0000 -@@ -65,14 +65,18 @@ - @ 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) -+ - if [ ! -d "$(DESTDIR)$(DOCDIR)" ] ; then \ -+ $(INSTALL) -d -m 2775 $(DESTDIR)$(DOCDIR) ; \ - fi -- $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc -+ -+ $(INSTALL) -m 444 CHANGES $(DESTDIR)$(DOCDIR)/CHANGES -+ $(INSTALL) -m 444 COPYING $(DESTDIR)$(DOCDIR)/COPYING -+ $(INSTALL) -m 444 README $(DESTDIR)$(DOCDIR)/README -+ if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \ -+ $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \ -+ fi -+ $(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc - - clean cleaner : - for DIR in $(SUBDIRS) doxygen ; do \ -diff -Nur wcslib-4.6.3.orig/makedefs.in wcslib-4.6.3/makedefs.in ---- wcslib-4.6.3.orig/makedefs.in 2010-12-10 03:40:57.000000000 +0000 -+++ wcslib-4.6.3/makedefs.in 2010-12-10 05:03:22.000000000 +0000 -@@ -124,6 +124,7 @@ - prefix := @prefix@ - exec_prefix := @exec_prefix@ - -+ DOCDIR := @docdir@ - LIBDIR := @libdir@ - BINDIR := @bindir@ - INCDIR := @includedir@/$(WCSLIBV) -@@ -198,6 +199,7 @@ - -@ echo ' SHRLN := $(SHRLN)' - -@ echo ' LN_S := $(LN_S)' - -@ echo ' INSTALL := $(INSTALL)' -+ -@ echo ' DOCDIR := $(DOCDIR)' - -@ echo ' LIBDIR := $(LIBDIR)' - -@ echo ' BINDIR := $(BINDIR)' - -@ echo ' INCDIR := $(INCDIR)' -diff -Nur wcslib-4.6.3.orig/pgsbox/GNUmakefile wcslib-4.6.3/pgsbox/GNUmakefile ---- wcslib-4.6.3.orig/pgsbox/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/pgsbox/GNUmakefile 2010-12-10 04:51:38.000000000 +0000 -@@ -123,20 +123,20 @@ - - install : build - $(MAKE) -C ../Fortran install -- $(INSTALL) -m 644 $(LIBPGSBOX) $(LIBDIR) -- $(RANLIB) $(LIBDIR)/$(LIBPGSBOX) -- $(RM) $(LIBDIR)/libpgsbox.a -- $(LN_S) $(LIBDIR)/$(LIBPGSBOX) $(LIBDIR)/libpgsbox.a -+ $(INSTALL) -m 644 $(LIBPGSBOX) $(DESTDIR)$(LIBDIR) -+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBPGSBOX) -+ $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a -+ $(LN_S) $(LIBDIR)/$(LIBPGSBOX) $(DESTDIR)$(LIBDIR)/libpgsbox.a - - if [ "$(SHRLIB)" != "" ] ; then \ -- $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \ -+ $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \ - if [ "$(SHRLN)" != "" ] ; then \ -- if [ -h "$(LIBDIR)/$(SHRLN)" ] ; then \ -- $(RM) $(LIBDIR)/$(SHRLN) ; \ -+ if [ -h "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \ -+ $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \ - fi ; \ -- $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \ -+ $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \ - fi ; \ - fi -- $(INSTALL) -m 444 *.h $(INCDIR) -+ $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR) - - clean : - - $(RM) -r *.o *.i a.out core *.dSYM $(EXTRA_CLEAN) -diff -Nur wcslib-4.6.3.orig/utils/GNUmakefile wcslib-4.6.3/utils/GNUmakefile ---- wcslib-4.6.3.orig/utils/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/utils/GNUmakefile 2010-12-10 04:11:54.000000000 +0000 -@@ -102,10 +102,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.6.3-ldflags.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-ldflags.patch deleted file mode 100644 index d0fe5bb4df54..000000000000 --- a/sci-astronomy/wcslib/files/wcslib-4.6.3-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur wcslib-4.6.3.orig/C/GNUmakefile wcslib-4.6.3/C/GNUmakefile ---- wcslib-4.6.3.orig/C/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/C/GNUmakefile 2010-12-10 03:46:28.000000000 +0000 -@@ -171,7 +171,7 @@ - cd tmp && \ - trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \ - $(AR) x ../$(PICLIB) && \ -- $(SHRLD) -o $@ *.o && \ -+ $(SHRLD) $(LDFLAGS) -o $@ *.o && \ - mv $@ .. - - $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ; -diff -Nur wcslib-4.6.3.orig/Fortran/GNUmakefile wcslib-4.6.3/Fortran/GNUmakefile ---- wcslib-4.6.3.orig/Fortran/GNUmakefile 2010-12-10 03:40:58.000000000 +0000 -+++ wcslib-4.6.3/Fortran/GNUmakefile 2010-12-10 03:45:35.000000000 +0000 -@@ -173,7 +173,7 @@ - cd tmp && \ - trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \ - $(AR) x ../$(PICLIB) && \ -- $(SHRLD) -o $(@F) *.o && \ -+ $(SHRLD) $(LDFLAGS) -o $(@F) *.o && \ - mv $(@F) ../../C - - $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ; diff --git a/sci-astronomy/wcslib/wcslib-4.6.3.ebuild b/sci-astronomy/wcslib/wcslib-4.8.ebuild index 0ce21b0932dc..1c0891251335 100644 --- a/sci-astronomy/wcslib/wcslib-4.6.3.ebuild +++ b/sci-astronomy/wcslib/wcslib-4.8.ebuild @@ -1,10 +1,9 @@ # 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.6.3.ebuild,v 1.3 2011/06/21 16:08:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.8.ebuild,v 1.1 2011/08/18 05:45:59 bicatali Exp $ -EAPI=3 - -inherit eutils fortran-2 virtualx flag-o-matic autotools +EAPI=4 +inherit eutils fortran-2 DESCRIPTION="Astronomical World Coordinate System transformations library" HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/" @@ -13,51 +12,39 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2" SLOT="0" LICENSE="LGPL-3" KEYWORDS="~amd64 ~x86" -IUSE="doc fortran fits pgplot test" - -RDEPEND=" - fortran? ( virtual/fortran ) +IUSE="doc fortran fits pgplot static-libs" +RDEPEND="fortran? ( virtual/fortran ) fits? ( sci-libs/cfitsio ) pgplot? ( sci-libs/pgplot )" -DEPEND="${RDEPEND} - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" +DEPEND="${RDEPEND}" pkg_setup() { use fortran && fortran-2_pkg_setup } -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-destdir.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-autoconf.patch - eautoreconf -} - src_configure() { econf \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable static-libs static) \ $(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" + # nasty makefile, debugging means full rewrite + emake -j1 } src_test() { - Xemake check || die "emake test failed" + emake check } src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - if use doc; then - insinto /usr/share/doc/${PF} - doins -r *.pdf html || die - fi + default + use doc && dodoc *.pdf && dohtml html/* + # static libs are same as shared (compiled with PIC) + # so they are not compiled twice + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a } |