Version bump

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

4 files changed, 29 insertions, 97 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index e2e82867f97b..ee74d9154cae 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.39 2014/04/03 16:38:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.40 2014/05/06 15:55:36 bicatali Exp $
+
+*wcslib-4.22 (06 May 2014)
+
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +wcslib-4.22.ebuild,
+  -wcslib-4.19.ebuild, -wcslib-4.20.ebuild:
+  Version bump
 
 *wcslib-4.21 (03 Apr 2014)
 
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index e7b6d82856fa..9d0a79944b41 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST wcslib-4.19.tar.bz2 1876148 SHA256 c12d2422fa73a3a50eff157631119ae1d9e4a14be7b3e4011da9a82c88c72131 SHA512 1f943cc6cba1b406548d5942c419c56b87261e91367b76376ea43ac039ed292b70a35272541d918112f1468316f6b780f9efb72f797d9278e9ed85f313d3fc33 WHIRLPOOL 4fb2830665d8988961c3dc632743a5d2e4de572115b708b6e0ae8611aada7e9c7a769d262de186d01e5e25721f4d1839804c797c5f990202aba7575ae3d9d72d
-DIST wcslib-4.20.tar.bz2 1879895 SHA256 f664beff64269222f53392e20f37d1812681c8c030eb1707bcc324c1c40339bb SHA512 b43dcbfbf7a755638d4d2dc69652ba4280ac5711760deb7093d388e490996f897d971f497e8f0504c617ca71bfaf6297cc7a2a175c2883612ff7912c6207afa8 WHIRLPOOL f9956c947b230a749ffd88583bef36331f368279060357e672423aea3b723b9219ee3bc2d686533a046d4e57961927808b1e2f2a10c48cfa315d1d734bf1949c
 DIST wcslib-4.21.tar.bz2 1865628 SHA256 530eb67e432ce0d881f91e9b08734a346a98cee06233433da79ad0c7d5f144ae SHA512 0fdd7b6cb234565e2dc3b619ec219918103c7a14916294004c12c709be803b10f064fa01c9647a46d2588d4f880ed7db6e65758b510d1a556b3b46f7bc836cdd WHIRLPOOL daaa3ba60cab0aac0619d317ea338f8d734a6d924c49d806a509560e6cd89a896f4594d48e760997d1289d2639c6a81b8802f65a2d95a3cd82efa533476a354a
-EBUILD wcslib-4.19.ebuild 1745 SHA256 d05d12c41f6bbc3e102d690ab3a1b21e791e6f7d98e66cdf7e24016b28b8abb8 SHA512 9979fa4a1e910ee65ee235d276fc668d2ed19def59670ebdcea8687352970c98d17567b993ed4d1f54fe969408e970f83560cb4bc1297b30469eef6488980373 WHIRLPOOL 3aec3e7beb3ab467f0123a725a583a793c952fa806b6e56c0e61d06121e349d5d185b75abd60bb1def34b12188b8ee0d651c7d8ce3e48f7117d998f95fb0c543
-EBUILD wcslib-4.20.ebuild 1745 SHA256 761c0b86fc7b623766670dfaf281621083bb4835eee7273b98cbb978c483bf08 SHA512 2195a6e3ee2d969dc42158e446ae88025f5eaa22fbd87d785eb13ad3a67c339042635d6eff93e5ce16f548a24d8e8c0cd544dc3d5da7a844c29f03adfdd7cfe0 WHIRLPOOL 4f77e35bb0412c66b73b85ede3a646f6cf17ff9052f882cde506559ed759c42592799c7dee3b029c54f17c75376d846b7a717b8f5408686634930fd836dea2f7
+DIST wcslib-4.22.tar.bz2 1866676 SHA256 afafdf772cb0fe97ae886cbf512fb114d842ca358cce7df9fa93449d1b556950 SHA512 9288314d842a9b54536b5f512900933e2ac307ef81003172fa511c8334f430161f28084309cde7ad2d94d39020eacec33cf8944d30d78abb51f3e7ff01be2bc4 WHIRLPOOL 629bbca2672d0d9ac03696deadfcea155c912c14ef115defac48966c41714ae692fe5cd60587a733ce691612bea9f48d212587dd0a2327739839328b90eae399
 EBUILD wcslib-4.21.ebuild 1755 SHA256 ff091149c45766d1e40fdeaebe9d06e956bf31daa3a803edc6461dd048c7309a SHA512 20b07570fdbc2cf8a8cf85679f4b0316270f861e49aaa8d35f90cae6b70e33ca73544ebf4aa12c83c79d995672a2fcf8e3048f7499e5bbf03455f64d2f1704f7 WHIRLPOOL 414ebbb1882fa4302170d7f7df16680b0829fd935353fe3518199409a1e40adf8fa55fbfbc3559e024596908665a92160ca20ce81a3dc46bd8f07c17f0a0a941
-MISC ChangeLog 6964 SHA256 d67f724dd621ca931f270bf177a8298569879ad3f930133beabc23de45c97992 SHA512 0da767a2f6d2ade95a90f63fdd43977794011be965d33b4c7838d45ce983cf132a1f468ad258a909c993d2200311d743998383008fbf8219c6a8aa82ed6a1999 WHIRLPOOL c315e4b18d8e8174c0e2e91d23ed7ca6e45745aac0c9f1d417c73530149d93c4e1e3e5a055a9d4d03a6887eb98eac8f61f61b56fefd70e4d61440b7b360a3977
+EBUILD wcslib-4.22.ebuild 1764 SHA256 2dbb28ea768e618163468516f69f0883d61dc2affd1b0451003caab5d291df74 SHA512 31d077e0539c5d8801ca550c7e99cf0646ec8ea38086e8192fb22785dd22c520a6e66d2072f193996c85915372c2174dc74a3a16efaa4320b1af8f1d3eea3067 WHIRLPOOL a7426c060b4de0b0bf79e9fe9bad114417978d0dd1e83d794130925853c25b5fe73b9170d88367f31d71ec2722de646cb68ea49bd5258363d81df5ab50b16e02
+MISC ChangeLog 7128 SHA256 0aaa3fb7fdcb8f5448bbe46a2f21a40efdc7ff5b5b48d6e1d110322c22e85bdf SHA512 6d8dc7ba0261f6071a4f9d8c3bd36774d3ae43c5fd7e38b59f7c94206c0d51330464b6e9b48c56da6e27b27602c417da00ee69ba78073de83613dbecf3045e4b WHIRLPOOL 8da4a89348710de1152a639092a03c0fee54bb45e18c2805402129a52b78c200dbd17aab832ed286fca6beed03c48737068500c95315348a97a3f48fecaf4713
 MISC metadata.xml 757 SHA256 5c745a2f9695a8ec277693ee9fdaed500d26bc34d410be59c3748c2ad5eb0a1c SHA512 de43a5ff60bf0f62555a43b9d30133ff6b2a125cecc1c8eeee81dad96bc134e7d9d77e9eda885a4d1ab1d1c8c867e1baae5c7fd62bee10149f1287c3b3a3c6f5 WHIRLPOOL 7b8f03c223715cefa2e13cf6b16ed81766230df043e87c216fffcc364c9842081c9732216ae80d1b55da309406af0ab027cd7aba25f8010dca6a9dea02b6af5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM9jpsACgkQ1ycZbhPLE2D08gCeO5lUWBODe6c6rh/m7kLuigRi
-FTAAoKLRNaVeOf5h7jbEmllnhbMfdDsW
-=bSUh
+iEYEAREIAAYFAlNpBfwACgkQ1ycZbhPLE2BTigCgq1TX9LmIcb5VHxXXe797bLWd
+4k8AoIm9rXfUIk1fbRj2Rdzgbfje6Ggx
+=38kg
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/wcslib-4.19.ebuild b/sci-astronomy/wcslib/wcslib-4.19.ebuild
deleted file mode 100644
index 69e4692693c1..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.19.ebuild,v 1.1 2013/11/22 19:48:22 bicatali Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib
-
-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"
-
-SLOT="0/4"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio )
-	pgplot? ( sci-libs/pgplot )"
-DEPEND="${RDEPEND}
-	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) \
-		${myconf[@]}
-}
-
-src_compile() {
-	# nasty makefile, debugging means full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs are same as shared (compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r "${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.20.ebuild b/sci-astronomy/wcslib/wcslib-4.22.ebuild
index ed05244a5605..504ae861e486 100644
--- a/sci-astronomy/wcslib/wcslib-4.20.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.20.ebuild,v 1.1 2014/01/28 18:23:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.22.ebuild,v 1.1 2014/05/06 15:55:36 bicatali Exp $
 
 EAPI=5
 
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs"
 
 RDEPEND="
-	fits? ( sci-libs/cfitsio )
-	pgplot? ( sci-libs/pgplot )"
+	fits? ( sci-libs/cfitsio:0= )
+	pgplot? ( sci-libs/pgplot:0= )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig"
@@ -29,33 +29,33 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable static-libs static)
+		$(use_enable fortran)
+	)
 	# 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)"
+			--with-cfitsioinc="${EPREFIX}/usr/include"
+			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
 		)
 	else
 		myconf+=( --without-cfitsio )
 	fi
 	if use pgplot; then
 		myconf+=(
-			--with-pgplotinc="${EROOT}/usr/include"
-			--with-pgplotlib="${EROOT}/usr/$(get_libdir)"
+			--with-pgplotinc="${EPREFIX}/usr/include"
+			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
 		)
 	else
 		myconf+=( --without-pgplot )
 	fi
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		$(use_enable fortran) \
-		${myconf[@]}
+	econf ${myconf[@]}
 }
 
 src_compile() {
-	# nasty makefile, debugging means full rewrite
+	# nasty makefile, debugging means probably full rewrite
 	emake -j1
 }
 
@@ -68,6 +68,7 @@ src_install () {
 	# static libs are same as shared (compiled with PIC)
 	# so they are not compiled twice
 	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r "${ED}"/usr/share/doc/${PF}/html \
+	use doc || rm -r \
+		"${ED}"/usr/share/doc/${PF}/html \
 		"${ED}"/usr/share/doc/${PF}/*.pdf
 }