sci-astronomy/wcslib: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 24 insertions, 36 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index adeefe65c086..3529a8fb223f 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2012/10/17 06:25:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.33 2012/10/19 10:45:53 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> wcslib-4.14.ebuild,
+  wcslib-4.15.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
 *wcslib-4.15 (17 Oct 2012)
 
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 5922ad15c222..e7ed2d954f18 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -3,24 +3,15 @@ Hash: SHA256
 
 DIST wcslib-4.14.tar.bz2 1591911 SHA256 f6fccfa4452a28b3b6f7c9e3a2f547ca429d04bf7bf56949ed54392267a99002 SHA512 7513dda03a2cb413584f203fdb91bceee90c7374449d6827adbb27f81623f8d5ace212d7ee19a4152b456929b19fe8b30d09ae101f05dcfc52dbfce7353449fb WHIRLPOOL b120561a67c5961e0eb54cc856fa49a60e5482c56e8f475c54ba5f53eb61dd15e2da2438c2dba8c8332d46c1f1ad65eecbddd7484363cf2909595a1ac28c8d00
 DIST wcslib-4.15.tar.bz2 1592952 SHA256 1d3393a91dbdbc6bdbb7e572be2ebd2187bc8943721fcbc9fb8b2db3db442904 SHA512 c4cc8d077cb47fefe631779fc2a68cc6cdb8f3d4dbae19ce4b89259cde76ac985819c23adefc5737f3c1908c271b70bac3f19d7d0c85622b3dacb2ea2f52c7fe WHIRLPOOL 1ca9a74edc29db9ca6d4e6d1c2793323b0bb0742ade19caa527961b6b4b52dc720e1b6e46c109f0457a6482a7fc54eef85967a2930e128dd6fe54dd13e1d7aaa
-EBUILD wcslib-4.14.ebuild 1415 SHA256 e224d1752132bff126c346c575e0aa11d4e5e63a2d02232a6a0f487e5b87c499 SHA512 90f24c5c3f299c90d03f7b33af85b8fed24d4515d4d24a26c909330b76e9abcbb01863f018633ce0e91f6c9936d24119277424e95c0a3ab35901f601c78227ed WHIRLPOOL 9983273206dad4a5951957c43821bc29a3c0816156d07897eacd18d246d477cc6cd82942933b9695c87cad53657eebd4f6c75267095fbd24bd9ede3d01b4df3b
-EBUILD wcslib-4.15.ebuild 1421 SHA256 fe8d1e134bec46035820d2a564174bb5e097b37300c21ce7e59ec1f7585ea566 SHA512 a5499419ef77059ffee9c564878384fa18d98f1c70bdfd2d08a47294246d7a961cc3f9a634bd8cc24266628e8f26dd283ef815b0bd13f4e9b27f94bca36f9662 WHIRLPOOL c4553395e207373b4b8d607afa6ccfa502ddf94abfa4133715dc6bb5d0f7be999d5f8c9c15f00a389906ffc0b485561b6cdb47728ab93210f2925d2177af9a4e
-MISC ChangeLog 5875 SHA256 a9437a41cb645be81d2e77680b67a0413752afb8878567fa01e25544b2f36144 SHA512 3981e6ad8064113c6773b826600df3f7ff41c80294aaf00122782c97640523c0e34f81eb02d0ca63ef771ad3b126b98f476d1bbcf4949b5353063adf8bff64ef WHIRLPOOL c53c46492a9a03c5a80d82ce848fc819c2324811b28131120ae6e5db6cf393009ff0b6deedb1db5276cc47bddbf1f370a04aad34e298608e32757c11d85d4788
-MISC metadata.xml 752 SHA256 ff8e4736cef8416a7771c3a7a6a8c970ab475d6ceff4194398251b57e3b02253 SHA512 b89e79aa327906309b364fdeafa05e6da2b644855fbe650485e361b90195d4cdb0f093b6a5ecf7a04df75967be87fe18e07b469cf019472b3932a33a2f737fe0 WHIRLPOOL 1dac61166e43db986a8f5843335bc49d7d13d1fa739bd1f152375e970a533e258b3094dea589c82c347b58b4f1143ac5b6ac6f6bf04841664d2b9c84211b707d
+EBUILD wcslib-4.14.ebuild 1334 SHA256 f56de65cd0757afc2354a6211c0b0cf81090dc07190b188bd415ca9ecdbf8dce SHA512 33ad476b2e4c62a6582b3f2106eacd8a0fbaef21e74d4595b043e5993f8cf46d6d53527e8cd05b6aa740b0f90cc905bf73b9e6cb7c9ec0d6624ecad9ca25d2a2 WHIRLPOOL 5ceb4183f0bd91e4f59da4979798becf90451450274872af1c9bf9c5b8a419afac063c59dddc01d676acc1d84814e3464cb8948f1fbaabcd1ef647f34bf78927
+EBUILD wcslib-4.15.ebuild 1334 SHA256 f3b674c27db109fbf1fd4427cac2fb10f2cc94d0f3a80a4b8c46d76ecd7c880f SHA512 c739d8d208272d83b59466b921f65ffec4332b6fec8a964a90ebb85ba43f69d9a90e2eb447196a7580a9588b97a18ee203b86923ef47b8f9e8d24ce01790b7ee WHIRLPOOL 8990cb85a231e3fc07f82a6605ab76b659555ac8d969dc952133f07417f6ff2eb7043c9b616f4359fff9a1e925c094e2eeb5ecde92502b8b73cded53bd47ae31
+MISC ChangeLog 6078 SHA256 a844655908a464674f0e903ed8aa655af6fd3bbeefd2807d459f4c6fa80e7923 SHA512 e381949efd63543ec36dca3b6c574ce481ff939ccde71fa5a413d432caf84ccc6d7ec5c600aa8263197b5281d3fec96912bce7f0c3436e8c82e53ca101bb6206 WHIRLPOOL 076b3811e7755f2f841b9cb87a9387c85f8435d75b98cd786280d2b52b23155964fef1bc3343d9b69cbd3c632aa963b88f8b8d12565fcc08bdee6c1d47d40d17
+MISC metadata.xml 756 SHA256 00b2f95a5f729835abc3ccfc0cdcf03a0431ee5ea7e2793f7f4ab8112db287df SHA512 6630817e23f48d016c4af858282d7650afce0cfdd3702d9aa36e6174d8db62c828e4f31b9441cc27026d5301f8b424212b8fecab1ba7150d0e05bb9dcf40811f WHIRLPOOL 96661a50a90c5d0be7771e0859ac4fd637636c1dd9e7da7f114b92856ed7f7c8dcc38c16c9a5a8b2239660638c4b434b4a38b95bf5f701704d1e451043cac392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJQfk97AAoJEF0huFKJUZL5BwIQAIeMRvEMR5ldtyn+H6gNO5WP
-W5UjFQ6vrf7kdL9Fv4kPJ8cIwUx/NVCr25d4oPyD2P1rIcxhWUdnOebW0OTIazbw
-SOpTKO8fkPEjG6VgTw5m5w338AgZnNV6TxZHZ50wlwzMMUQcfxMGYrQwNOzq6B4r
-kA9vHeDt4h01o9iIb4wHYaiRYBbRxbUy3OwHVm83Qd4iCivfPWLHZC9O33gjFNVf
-oWWJtOy2gHRncsAnS0n3kqbZAKp0t7421V3ISk2ynDuT4s1WIagfcwm1iiHdyZbt
-7MNMUgwxtxOXLqJ+NNl0selsX+VzepxxbQN71BJGFBQhvSonev2S5bqgFrHfATyj
-isHkSK9KwRVfPEttqX8hlLjb3ZD4L3RveNw/6s2ZxSLqUUczYnHMT+jFpMjGEvBo
-gamec2Wrl9ByTkURXJ8z9KX19F8Kre/tCBopBKzEQVz+1PwliBvMZnOL8XoSpee4
-NfsH1Is+Rprh7ktPEr5zCwBRuljhKEkquNmM2qzroZZayVNQjHYn+IGwca6v8/sC
-MvnPrEYEkFMicZCYYFfrYDcAhqsOZmdvVSpVGfVRZ4V5rJSjyxfTnzOQBQckAo1C
-RvRs8g0uij1toW14nXCicaz+3W9QPSly4W6k/tzDi/QTMl2pQa7jK3ai97KAFNo+
-iSQpf93tTDSPVY+hJ0La
-=6RgS
+iEYEAREIAAYFAlCBL2MACgkQgAnW8HDreRZoIACcCoJhEpWb56y2SITji0RUVJV3
+QCgAn1qjyqWo5dwR0pGBd3Xsswkz6jiY
+=AKoZ
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 312ebd3932ba..771ec2d60887 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'>
+		<flag name="pgplot">
     Builds routines for the  <pkg>sci-libs/pgplot</pkg> library
   </flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/sci-astronomy/wcslib/wcslib-4.14.ebuild b/sci-astronomy/wcslib/wcslib-4.14.ebuild
index 8e3d1909bd8b..722f896de9ee 100644
--- a/sci-astronomy/wcslib/wcslib-4.14.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.3 2012/10/14 18:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.4 2012/10/19 10:45:53 jlec Exp $
 
 EAPI=4
 
@@ -17,16 +17,12 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs"
 
-RDEPEND="fortran? ( virtual/fortran )
+RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
 src_prepare() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
diff --git a/sci-astronomy/wcslib/wcslib-4.15.ebuild b/sci-astronomy/wcslib/wcslib-4.15.ebuild
index 1ff038239d59..eca864f26c31 100644
--- a/sci-astronomy/wcslib/wcslib-4.15.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/10/17 06:25:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.15.ebuild,v 1.2 2012/10/19 10:45:53 jlec Exp $
 
 EAPI=4
 
@@ -17,16 +17,12 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs"
 
-RDEPEND="fortran? ( virtual/fortran )
+RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
 src_prepare() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }