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

(Portage version: 2.2_rc86/cvs/Linux x86_64)

5 files changed, 99 insertions, 2 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/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
+}