Version bump. Switch to EAPI5, do more checks for cfitsio and pgplot to work for non standard location such as prefix

(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 40 insertions, 15 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index a9c88e790d33..60f618be15f7 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/wcslib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.34 2012/11/14 18:51:43 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.35 2013/02/20 20:45:12 bicatali Exp $
+
+*wcslib-4.17 (20 Feb 2013)
+
+  20 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> +wcslib-4.17.ebuild,
+  -wcslib-4.15.ebuild, metadata.xml:
+  Version bump. Switch to EAPI5, do more checks for cfitsio and pgplot to work
+  for non standard location such as prefix
 
 *wcslib-4.16 (14 Nov 2012)
 
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 771ec2d60887..8d2a6dc47dfb 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   WCSLIB is a C library, supplied with a full set of Fortran wrappers,
   that implements the "World Coordinate System" (WCS) convention in FITS
   (Flexible Image Transport System).  It also includes a PGPLOT-based routine,
   PGSBOX, for drawing general curvilinear coordinate graticules and a number of
   utility programs.
 </longdescription>
-	<use>
-		<flag name="fits">
+<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 name="pgplot">
+    Builds PGBSOX routines, needs <pkg>sci-libs/pgplot</pkg> library
   </flag>
-	</use>
+</use>
 </pkgmetadata>
diff --git a/sci-astronomy/wcslib/wcslib-4.15.ebuild b/sci-astronomy/wcslib/wcslib-4.17.ebuild
index eca864f26c31..4c94668d7579 100644
--- a/sci-astronomy/wcslib/wcslib-4.15.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.15.ebuild,v 1.2 2012/10/19 10:45:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.17.ebuild,v 1.1 2013/02/20 20:45:12 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 FORTRAN_NEEDED=fortran
 
@@ -21,19 +21,37 @@ RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
 DEPEND="${RDEPEND}
-	sys-devel/flex"
+	sys-devel/flex
+	virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
 
 src_configure() {
+	local myconf=()
+	# hacks because cfitsio and pgplot directories are hard-coded
+	if use fits; then
+		myconf+=(
+			--with-cfitsioinc="${EROOT}/usr/include"
+			--with-cfitsiolib="${EROOT}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-cfitsio )
+	fi
+	if use pgplot; then
+		myconf+=(
+			--with-pgplotinc="${EROOT}/usr/include"
+			--with-pgplotlib="${EROOT}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-pgplot )
+	fi
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable static-libs static) \
 		$(use_enable fortran) \
-		$(use_with fits cfitsio) \
-		$(use_with pgplot)
+		${myconf[@]}
 }
 
 src_compile() {