Version bump. Ebuild now allows to disable cfitsio, fortran and pgplot dependencies.

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

6 files changed, 108 insertions, 8 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 8dfabdc36751..5107944846c6 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2010/07/21 16:25:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.12 2010/09/23 22:37:20 bicatali Exp $
+
+*wcslib-4.5.3 (23 Sep 2010)
+
+  23 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  files/wcslib-4.4.4-destdir.patch, +wcslib-4.5.3.ebuild,
+  +files/wcslib-4.5.3-fortran.patch, metadata.xml:
+  Version bump. Ebuild now allows to disable cfitsio, fortran and pgplot
+  dependencies.
 
 *wcslib-4.5 (21 Jul 2010)
 
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index a0e7f0ed089b..398bca8da8e7 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -3,18 +3,21 @@ 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 5190 RMD160 3f95bc8dbb1a36e572c75d4a6208fffa8be4d121 SHA1 87f7c035715f2af628f484abdf9468a18e0d1139 SHA256 2556744ff3d6e01cd447d9a774d20c882617c7a7a0dd8bc773c244c09a15b322
+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
 DIST wcslib-4.4.4.tar.bz2 1590830 RMD160 f2349b099777cddaca71def9c3f65458b42e862c SHA1 ba65d95dc5ce0bdf562a3f96280b6505e9ee66ae SHA256 557ecab50af0cb84e4f18ca19eede3624d6538f22eb580bd5a67f78f7d65ebaa
+DIST wcslib-4.5.3.tar.bz2 1551287 RMD160 9557049ca8c6e8aefe62ff5c948130c6154e4d6d SHA1 49158f4a4283886d3bf568975dca9843de9d71bc SHA256 62daaeed5618ad2a06a4f0951cd66effbbe95b7f0e5cbaad7220d02cc9a6b135
 DIST wcslib-4.5.tar.bz2 1545053 RMD160 8325e126356abba4220cfbf188f07554159fa248 SHA1 4726d7f34bfae12acff14fd813b558c432889ca0 SHA256 65d72c25a20bf5cb3c583009cad106a6810c9b9533c369d607d226f5b6f9f417
 EBUILD wcslib-4.4.4-r1.ebuild 1251 RMD160 4a05cf7754ea4a134f738556f8e60a561843520b SHA1 7f06773fa9bfdc7d5035bf77339abd8cb6a96ea2 SHA256 0e3b44c203400dd5b04a9b935017ee60bb8e3477f5bb1edcac57d540f79b8548
+EBUILD wcslib-4.5.3.ebuild 1436 RMD160 4c513e3ba855cfe7d9213e1c5b7d49788c3a5fff SHA1 c9f4ba069e8c8ec3096caded58996fa7c1886d1c SHA256 faea3bb0b4425ad6efdb35287ad76b9a7d202240565859a61934d487edd487a8
 EBUILD wcslib-4.5.ebuild 1213 RMD160 600e23844ac0c0546e7cad62f852dee3d7e6aa51 SHA1 af6f4d96f5faaecce78aafa1e938a1162b47a4f4 SHA256 e52dea787ebf43e4b68c5cf7342ea0a78c992b4aa25aae7dd8d356f4ef06ffc0
-MISC ChangeLog 2229 RMD160 94768effac21b482d7658d716457f2b8408300e7 SHA1 bcddbea426e75e0a600a11e7dc876b429b51c6ec SHA256 ffc8fc5cb06304635287ae0160ce81228cd4df4318f9366e1fac8bbc09cdbfd7
-MISC metadata.xml 526 RMD160 b4130ef4285e199d5c07d9848f095c138b7e5d39 SHA1 17a684cec86c065cec536197709034dcc6a8ae80 SHA256 4819cc3667c7460268fe9ada14c4c69606d30335d6a249da471d5c598b5c1e9e
+MISC ChangeLog 2512 RMD160 d021a5273d4081c4651def5f03d369a621b756dc SHA1 575a16d4c07c264c9c8b16cb89748c316f51cf47 SHA256 4b002e461a7d1dec2270790b43b264bd8137eccf40c89c2d5855b01c8d42abd2
+MISC metadata.xml 742 RMD160 2d6d181c32accd9116f5c29812d74e0b65df6f1e SHA1 bfd5ec4164079dcf73f576567c8d5d579fd53bf6 SHA256 db4dd208778223b3ce2fb7672ac5364b96735305472ab4bfb858e69c93532925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxHH40ACgkQ1ycZbhPLE2CF9gCdHVferFOOZtekduHMCQfIMpNr
-IrMAn1FA1dHJpQzVVPjH5EdB0FzG7qqX
-=78go
+iEYEARECAAYFAkyb1sQACgkQ1ycZbhPLE2BfkgCePKzAR+mMJ1MBtetKSXUJujK3
+gjEAn3qbASJahWY4thkTCSS1ZeL8NCQA
+=xQx2
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
index 6d3d21c76957..96374e992341 100644
--- a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
+++ b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
@@ -106,7 +106,7 @@ diff -Nur wcslib-4.4.4.orig/pgsbox/GNUmakefile wcslib-4.4.4/pgsbox/GNUmakefile
 +	   $(INSTALL) -m 644 $(PGSBOXLIB) $(DESTDIR)$(LIBDIR)
 +	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB)
 +	   $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(LN_S) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB) $(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)
diff --git a/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch b/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
new file mode 100644
index 000000000000..2121bd2945ae
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
@@ -0,0 +1,26 @@
+--- 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/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 99168ad415db..d645f6ce3e07 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -9,4 +9,12 @@
   PGSBOX, for drawing general curvilinear coordinate graticules and a number of
   utility programs.
 </longdescription>
+<use>
+  <flag name='fits'>
+    Enable support for the FITS format through <pkg>sci-libs/cfitsio</pkg>
+  </flag>
+  <flag name='pgplot'>
+    Builds routines for the  <pkg>sci-libs/pgplot</pkg> library
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/sci-astronomy/wcslib/wcslib-4.5.3.ebuild b/sci-astronomy/wcslib/wcslib-4.5.3.ebuild
new file mode 100644
index 000000000000..1807f09b1638
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-4.5.3.ebuild
@@ -0,0 +1,55 @@
+# 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.5.3.ebuild,v 1.1 2010/09/23 22:37:20 bicatali Exp $
+
+EAPI=2
+inherit eutils virtualx flag-o-matic autotools
+
+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 fortran fits pgplot test"
+
+RDEPEND="fits? ( sci-libs/cfitsio )
+	pgplot? ( 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
+	epatch "${FILESDIR}"/${PN}-4.5.3-fortran.patch
+	#append-flags -U_FORTIFY_SOURCE
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(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"
+}
+
+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
+}