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

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

7 files changed, 24 insertions, 121 deletions

diff --git a/sci-libs/amd/ChangeLog b/sci-libs/amd/ChangeLog
index 9dc9146585e3..563a25bfbeea 100644
--- a/sci-libs/amd/ChangeLog
+++ b/sci-libs/amd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/amd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.32 2012/10/15 22:05:03 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.33 2012/10/16 20:51:56 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> amd-2.2.0.ebuild,
+  -amd-2.2.1.ebuild, -amd-2.2.2.ebuild, amd-2.2.3.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   15 Oct 2012;  <naota@gentoo.org> amd-2.2.3.ebuild:
   Add ~x86-fbsd.
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 2e0d6a311b39..8a141f4550de 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -3,29 +3,16 @@ Hash: SHA256
 
 AUX amd-2.2.0-autotools.patch 2824 SHA256 4adeb6790313aadcd85a17ea8a663055d3899c1c189fba8636bf65621950ca28 SHA512 0271fff323da462cc3d47346239d6204b95361e197700bd357697a1160f278f62c08dd28493740bed6337abeee6ffa377de4907f7935b03409f80581477185ca WHIRLPOOL 7140328b240080356a4dab2c5949c0518d65435f49e0b1a7e5f280b84eb6011749e974cff65bd7a3034f7af8d5a515016ac5edd8cd9ca9bb4da364995fe7d15c
 DIST AMD-2.2.0.tar.gz 267728 SHA256 b4978ed99f61204456a27b1c86aa149f49dbead5df12decd8c34e15547e75ff8
-DIST AMD-2.2.1.tar.gz 268478 SHA256 cc2b3c2a25f06ef273062a22cb2fb4296ece002de2e4d28487d4dd93c4c605a2
-DIST AMD-2.2.2.tar.gz 268666 SHA256 5b3f538d558169169d05f5b020f965bd1b25e7a927466b010f9f063f874b7b1a
-DIST AMD-2.2.3.tar.gz 261613 SHA256 36656973da99afcde631e7f6185d44bd57eb7d1b0b4f220da10eb3defbd68382
-EBUILD amd-2.2.0.ebuild 1046 SHA256 acc1e0b24ac6a0d202f6edb514d41bc133caba5df8e4e028f8133475d3bb6cb4 SHA512 252144fd77d6fd00b13aa22f8afe031df4e066271ec38ebcf55c4dc798b8c4e7919638c4865e872ed26785df13cd959fa43e6af6444ebee58c9d7c80e43a7e35 WHIRLPOOL df7902eddd94fbf8e6411a7220ffa4cdf0eed86dc7ce7431cb8b0528dac6e906816db8fab6ada953c20206615eba5b61e71ad5b2d3d7db4539bacec0f4890999
-EBUILD amd-2.2.1.ebuild 1121 SHA256 9945f545d2e5ea28d93e04a81dd04ea31b4e91e2d56f2f1c1bb97cc02d76407f SHA512 ab2341bcdc1a05133385d44e258412f5787dddb6d26fef1e4b3f6c184cb3b43aee61a52acb4fcf75de6cf4f11b294b63042a2c17479f8f01595c205636f857fe WHIRLPOOL 74d3691e83a7aacb6635bc82a28b490ad343eb892313c8c30cdd4ffe188e91f1e931a7a15f9f3c488689555563dc5639e46779d34eba51b6ea2d6dc09d570a8b
-EBUILD amd-2.2.2.ebuild 1121 SHA256 177ada6a91086204d4e6754a2e06f255c03e3eaf481041837a5a3cfd4f7b78d6 SHA512 db396b4c7d4f71ca0f26c76b59b67ea950d23dce7609caa9dccd53fde0ac6838a9b7eec3b70896228ae3c3069c58f5a0e716164b263cfdf1107588c3562c82f7 WHIRLPOOL 4ee99deca8e231d7ab420bb53bb7b32e151254d853ac0ed203e327b367dd900afe34b6e1731d9d27e54e7ba6a8b26c5acfdedba976451b8e7911e6966fe1f254
-EBUILD amd-2.2.3.ebuild 977 SHA256 114151c18cbe6661638be8d909789b0b27f8d7dbd398f5524f5d3d6ced2433a6 SHA512 08b5ebaf32c51b94b0b8618fcefe0da7a98eb2861a4693b59b988f15fae87a0f2ccd7197773cccc71171ea570a850585a5fe8175e04f3e74b730ea35fdb8f94b WHIRLPOOL 9736a4e60b75c79d59d9f6a811e21ee5fd6c6e4b499611526776520a03312ed2f0b2f28e76316fe90c5b33870c5b809c84bd65d37732e5b5182735da9ecc1c11
-MISC ChangeLog 4001 SHA256 8ad6913abfec7d28d1f1aea20d07043b15d827b7a70f95a26ed569a380fc0f48 SHA512 a7bfb8013961dc0627857b909c0374d1b874e8b3e780bf7e45ee6de1b4c13564672f0ae02d939e0d0ed04368754f34bc9e0ad4e81fb580907e2698e830f225ec WHIRLPOOL 67d733751864286a1735de0cedaf307fd84329da7e0b5e87052f38e1aaa369ba83a6c4529abbd0e41ef7e73dca8ae5825de6f8efdbf9c4d2ce830c78ed539b73
-MISC metadata.xml 477 SHA256 23293ac4525f781e34728c4faea25ecd9ac2f98a3b6c843a5dc83a1160c8ed2c SHA512 a5e96c81a99f42f2c35a12217d51eb343dcc5085689e471cc7a46f9563d24025a1dca9b2a6db8713be07d97420a55fc7d35ab846303db34e963c64d04ecca180 WHIRLPOOL 88cf917fce9aabccf1088f19ca09c9763ef3864b4196118749b1e7f2f4fdc674b0a27499a60b649d45afa33f80e6fd77cf95cd2988f4f716f2c0f6ea8f2e77e1
+DIST AMD-2.2.3.tar.gz 261613 SHA256 36656973da99afcde631e7f6185d44bd57eb7d1b0b4f220da10eb3defbd68382 SHA512 8045d6cb8d040a0e7c29e43c76e76b5def9d548621b2d7062fdf10a69bed82636575357abef3e1ea0cdc9d7b2c1173d16db1cc81871fb7081a734dd8ce0df1d7 WHIRLPOOL 9b6a80b59e4cadfe6a796116219f1e52ac408835e6df2351ca0349d97aa103546658db699cf6811798f13466b8f4aabfc7ddeffdf36e397ad12124c6a99c7bde
+EBUILD amd-2.2.0.ebuild 1028 SHA256 4a6a465376a42e33cc372bbf09db476733bc1353fde15d667fec806073c847bc SHA512 1fdfd5c60a8fd6fe1a8ede0bd7470bdf0b1cdf23d6154e1b3a7d7dd2fc159d4ff7b88513f395cabddbe8d62444ae3d1d0731225f6f60857d3b9da46482fe0d33 WHIRLPOOL 1f18baece306243eed67a86a517a05699f193ec73415f8f174921543b0a6a32a0b161b5d6d4a3574a0ff7b710d089e153920b3c1e305fbf998ddb160aab5234b
+EBUILD amd-2.2.3.ebuild 960 SHA256 ad6768f155bc35aef8396c3a734ac60ef663841cf68e49ed5688303364a6cbf5 SHA512 d6d5fd3ef04ee880436a455e727dc697d73b591531ce0260c1fc1ff88563c37391573784157f4835a784ea7e3212de7101879cfa1a85c48d9431978fd8598f17 WHIRLPOOL 8526a94dd78dd343729b450b1a77c26e175f0114e32895ebac63dbaa45421fa026c2b7a75ad98ba2fc4c1b713c6c2e631648a931a18843ac48f13e15d7c3ee2b
+MISC ChangeLog 4243 SHA256 ad65848a25d589af7342b7f4097673f64fd59308f9cadc15f9d3d05b4abe3815 SHA512 9e730941f547d952e21cc2f9a63ea902730bb209e7442070271f4fec2cbac27716a29c49adcdd0bff2e60fc8f8631da3c5fdde172c2975c5abafa89da9688ef6 WHIRLPOOL cd8e94d23c21c6d9f48ee622fa867c8a171fc052cdd8c21d0339774985e1453ebcf910fc41d7a062595efc74fe20c00fd582e0133211d6f72da74270f6dcd3f1
+MISC metadata.xml 479 SHA256 0e08b2bed9dabf24427040c6ee966d0038b34948df2a3956d5da3358458cb4c1 SHA512 29afcd852f18f724316e18f8e04f3eb85e563bcbf7bbae3487d442684e9636b811e343958f393574f2e78280e08e1566c07be0cf021a5354dd36db146bae77c4 WHIRLPOOL f2c2e0ec66a5dee2a87aff4e5f3b36062878548af9ba8aa08775e6549629351601e2a787ba5a78ed1938f0758c6512ef1daaa100625f48fc4116634c9d2e2ec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJQfIiQAAoJEDYO1FT4VRUUwecP/254xz0Q7ZaVaHYDlZvV5N2J
-zd5QI1YdOFtadaz/paj9YENDBBPqh23nzzX+WjDx6Zv0SYv29Rof6vh2mZlT+C4S
-Xu4wfiTjXT/IjHL8TYz1kvEMWDm0oegCuZBrw6lynYK9Al5AD8hCkmdGAUyZ4Vj3
-DkT7qEY4Pf13YcWao4zBD/tadKwCPoUxQBw8d8GvLbOvK4b4cHPl0ulA9XSbivWn
-MQb6DwsrVOV6LnZUsv4yyqOXJ8KN9iUedOqY1VMb2Djr/bvwkyWrQKr8KfBikCa9
-cZVcR700KFg+Xo6711z4L4mIPV0CZeM0XTIEnygh4jqfGmigdQqXOMDO3GarSwT1
-ugl3vGQMLqVU0S0jv8jmFTNtCxszEV8lJ8By9L8clRw25sZE6pYH/U7pDORg2Lir
-qrOAXt09rcdBvhGygHzn6DojB25K7OQD77YRSoBjkiBbWLDPLLMvu2kGuWmiXnjD
-ZZOvGBS8alSb3q0KxCIC3V5Jv1N6iiuuPlvteGuSu8BNZXgMpwL8wa7ZPCjOdnam
-xfD5ugH8Bq+4a1+H8ESv68sLPImFJtR/IEc0z7VhN6RIsdmE4Kj4hvvX87IUkphy
-KNfBWyGn8ce43HIFOLAGCHW4KZOTxLC5kFcfAJg3VqAakk2OKLv82JgVYRXIZZCc
-Hn1Wq5C1hR/m/w+f54I7
-=M+Wk
+iEYEAREIAAYFAlB9yQgACgkQgAnW8HDreRalcACdHVV6xxoQXlwDtkhLqZ1Q0ZPY
+bzYAoIP1zbMgOBMuDxDL4FFa+U1QVGGG
+=+ODJ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/amd/amd-2.2.0.ebuild b/sci-libs/amd/amd-2.2.0.ebuild
index a9344e66ce69..08602ed57728 100644
--- a/sci-libs/amd/amd-2.2.0.ebuild
+++ b/sci-libs/amd/amd-2.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.22 2011/06/21 15:43:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.23 2012/10/16 20:51:56 jlec Exp $
 
 inherit autotools eutils fortran-2 toolchain-funcs
 
 MY_PN=AMD
+
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
@@ -14,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
-DEPEND="
-	virtual/fortran
-	sci-libs/ufconfig"
+DEPEND="sci-libs/ufconfig"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/sci-libs/amd/amd-2.2.1.ebuild b/sci-libs/amd/amd-2.2.1.ebuild
deleted file mode 100644
index d547f0c13706..000000000000
--- a/sci-libs/amd/amd-2.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.7 2011/06/21 15:43:02 jlec Exp $
-
-EAPI="3"
-
-inherit autotools eutils fortran-2 toolchain-funcs
-
-MY_PN=AMD
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc static-libs"
-
-RDEPEND="
-	virtual/fortran
-	sci-libs/ufconfig"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.2.0-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/AMD_UserGuide.pdf || die "doc install failed"
-	fi
-}
diff --git a/sci-libs/amd/amd-2.2.2.ebuild b/sci-libs/amd/amd-2.2.2.ebuild
deleted file mode 100644
index 530566885d21..000000000000
--- a/sci-libs/amd/amd-2.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.2.ebuild,v 1.3 2011/06/21 15:43:02 jlec Exp $
-
-EAPI="3"
-
-inherit autotools eutils fortran-2 toolchain-funcs
-
-MY_PN=AMD
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc static-libs"
-
-RDEPEND="
-	virtual/fortran
-	sci-libs/ufconfig"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.2.0-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/AMD_UserGuide.pdf || die "doc install failed"
-	fi
-}
diff --git a/sci-libs/amd/amd-2.2.3.ebuild b/sci-libs/amd/amd-2.2.3.ebuild
index 3ccda0ab7c42..427b373de5f5 100644
--- a/sci-libs/amd/amd-2.2.3.ebuild
+++ b/sci-libs/amd/amd-2.2.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.3.ebuild,v 1.4 2012/10/15 22:05:03 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.3.ebuild,v 1.5 2012/10/16 20:51:56 jlec Exp $
 
 EAPI=4
 
 AUTOTOOLS_AUTORECONF=yes
+
 inherit autotools-utils fortran-2
 
 MY_PN=AMD
@@ -18,8 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
-RDEPEND="virtual/fortran
-	sci-libs/ufconfig"
+RDEPEND="sci-libs/ufconfig"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/sci-libs/amd/metadata.xml b/sci-libs/amd/metadata.xml
index 896b0f21b2c3..220a9c29aa5e 100644
--- a/sci-libs/amd/metadata.xml
+++ b/sci-libs/amd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
 AMD is a set of routines for ordering a sparse matrix prior to Cholesky
 factorization (or for LU factorization with diagonal pivoting). There
 are versions in both C and Fortran. A MATLAB interface is provided.