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

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 47 insertions, 22 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/Manifest b/sci-astronomy/wcslib/Manifest
index b47e9beac5fd..f71211251619 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST wcslib-4.15.tar.bz2 1592952 SHA256 1d3393a91dbdbc6bdbb7e572be2ebd2187bc8943721fcbc9fb8b2db3db442904 SHA512 c4cc8d077cb47fefe631779fc2a68cc6cdb8f3d4dbae19ce4b89259cde76ac985819c23adefc5737f3c1908c271b70bac3f19d7d0c85622b3dacb2ea2f52c7fe WHIRLPOOL 1ca9a74edc29db9ca6d4e6d1c2793323b0bb0742ade19caa527961b6b4b52dc720e1b6e46c109f0457a6482a7fc54eef85967a2930e128dd6fe54dd13e1d7aaa
 DIST wcslib-4.16.tar.bz2 1594714 SHA256 3f293dcb75e1304507410843d13294de6e0d88556a4b6a10e919650bcfb2f337 SHA512 361b4c325422ff9d0dbf4d51b67530015fca3b76fea79f97abcaa7bead22ca4b6e7cfacca0c812187c8cc65004b9c5b7e4eea73c114be124789b9231e5f8b9bd WHIRLPOOL 7b8140edffadd4c75d58a6f2e457f7b9ba2b575c8652b727328933220ce768826f89761f6f50bb64ebac20639cd5545c711e64437dbb5137506e7797dad16389
-EBUILD wcslib-4.15.ebuild 1334 SHA256 f3b674c27db109fbf1fd4427cac2fb10f2cc94d0f3a80a4b8c46d76ecd7c880f SHA512 c739d8d208272d83b59466b921f65ffec4332b6fec8a964a90ebb85ba43f69d9a90e2eb447196a7580a9588b97a18ee203b86923ef47b8f9e8d24ce01790b7ee WHIRLPOOL 8990cb85a231e3fc07f82a6605ab76b659555ac8d969dc952133f07417f6ff2eb7043c9b616f4359fff9a1e925c094e2eeb5ecde92502b8b73cded53bd47ae31
+DIST wcslib-4.17.tar.bz2 1598044 SHA256 b81259260ece1afa738490e6ae3821315208cb5f121096fff958a0f90c3a7d5c SHA512 faab28fc25b7d02e0c2e2010a6bd259c52564c55818064d819008d9533951465ba5e5ee93a237ded52556bdf18ca681ccc7f082070d7c20d0a21cf9ed7c849e1 WHIRLPOOL 11c5dcda74463b0aeca72f043a906d8aaab4c0fe0dd8866604c805aca30017ddd7ac5755cbe7276ed535cec6b96c12b0343629ca6b5e1dbca69afd82765e0ecc
 EBUILD wcslib-4.16.ebuild 1338 SHA256 471c064b4619e0e75150f269897d317a28a49ed691126acfc55543f94b3b1cec SHA512 7764d12974127a38230e7a9ded2d271fd0fbebc05755e86e6fbdd6f1a8daf7512bb44387e506e78ce5e36b7ca482d43e27c003eaab6c0a3555194578c872e193 WHIRLPOOL 5509548574321666ff7c57a93007a5a87a540e564a60ca0625d9efda88a3617a5a7f3854cf94b19eb6e96ab058f94a7360e95aea64d48815195ae76e80cbe09c
-MISC ChangeLog 6225 SHA256 99332a6fcd54a73ceaf58c7a63aebbcd14884dabee7101b956310703a0fcb7a1 SHA512 954e3deb192b312a1bbf402acea27f0dedbf174ca290e1b4d22a926b118aa89874aed014de5debf8c6647a30d75303cb93f428f52042cdb7c33084122641ea8c WHIRLPOOL f18ab465eec2075b29b3eaaf5dc4492c5375214e750d975c3da552a43047c6c06f36c4dbceaf69489694f38e0ad755355e0e968ef922196cf58f46eb6b97175d
-MISC metadata.xml 756 SHA256 00b2f95a5f729835abc3ccfc0cdcf03a0431ee5ea7e2793f7f4ab8112db287df SHA512 6630817e23f48d016c4af858282d7650afce0cfdd3702d9aa36e6174d8db62c828e4f31b9441cc27026d5301f8b424212b8fecab1ba7150d0e05bb9dcf40811f WHIRLPOOL 96661a50a90c5d0be7771e0859ac4fd637636c1dd9e7da7f114b92856ed7f7c8dcc38c16c9a5a8b2239660638c4b434b4a38b95bf5f701704d1e451043cac392
+EBUILD wcslib-4.17.ebuild 1743 SHA256 db1b5ca885f320376e44b166c64bff87d246d7360a2fb3dc9b4273755fce8dfe SHA512 620ef72b91e54b5a96ae4f9898f0b08fe888bf703fb22b959a7f9648491d53754d8d5e4062a07bc82cbd664303ab41dcba08f447a9c175d533ec961e1b3e3281 WHIRLPOOL 6bd0fdf761d4b8702a09e2a24525f0f7c2049b5a3d0eb053ed1ff356a50b4213e9f0f73a00f656e3a2a4f4a6e7e16dba8395c3db12c423a6f17cb88fe153c531
+MISC ChangeLog 6489 SHA256 5b6af8a4d81e339898518081b4f16c65c93dc9c4525ab4036a6fc69949ca54db SHA512 9bb2731423dd94fbcdd31bcc3a99721f6aa3704c02cf6d8ddee2dd8195cc4343e3387a7c2e11456cbf7ce67f76099d422bda0a2236c6cb05dc9239044d4c6c3e WHIRLPOOL 34f6d92a27f8460790e15c8328eb265eb639ec52e7f61971906c7bc7325d34ede9e4ecbd5fe5f6bf32f7a64822df634e89e0b099298472485235fd0ba3494996
+MISC metadata.xml 757 SHA256 5c745a2f9695a8ec277693ee9fdaed500d26bc34d410be59c3748c2ad5eb0a1c SHA512 de43a5ff60bf0f62555a43b9d30133ff6b2a125cecc1c8eeee81dad96bc134e7d9d77e9eda885a4d1ab1d1c8c867e1baae5c7fd62bee10149f1287c3b3a3c6f5 WHIRLPOOL 7b8f03c223715cefa2e13cf6b16ed81766230df043e87c216fffcc364c9842081c9732216ae80d1b55da309406af0ab027cd7aba25f8010dca6a9dea02b6af5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCj6EgACgkQ1ycZbhPLE2D9jwCgl1dwXUuiE9+qSgQSiNAa6eEF
-bNoAoIUYUdj4lIxScATYthjMRS5FrGJc
-=QVav
+iEYEAREIAAYFAlElNd0ACgkQ1ycZbhPLE2BxQACgmYYx83uDdZ4XchxVm12Ze9Cy
+19QAn01+aZ7I83PaHdnhgEls4yVQjftN
+=scEG
 -----END PGP SIGNATURE-----
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() {