sci-chemistry/shelx: 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

4 files changed, 30 insertions, 28 deletions

diff --git a/sci-chemistry/shelx/ChangeLog b/sci-chemistry/shelx/ChangeLog
index da0e1badbf3e..b75e315a60fa 100644
--- a/sci-chemistry/shelx/ChangeLog
+++ b/sci-chemistry/shelx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/shelx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.21 2011/06/21 15:57:01 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.22 2012/10/19 10:29:30 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> shelx-20060317-r1.ebuild,
+  metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> shelx-20060317-r1.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-chemistry/shelx/Manifest b/sci-chemistry/shelx/Manifest
index 9e91c237be73..67eca781f17a 100644
--- a/sci-chemistry/shelx/Manifest
+++ b/sci-chemistry/shelx/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 20060317-autotool.patch 1218 RMD160 789e9ce9292733ad8856c9faf37aaf8f35180fac SHA1 a4a1832d4ae927de5285badf2eecfecfd80ea9a0 SHA256 6c41666ddb019d8ad42413723247fd8cda76e0b754e8fdce5734a6a4ba5ba9b8
-AUX 20060317-gfortran.patch 686 RMD160 0834f5c562628db093e7cb7738be75b66b0a00d6 SHA1 58f748513c54805969d7a3155dedf4edb5a709ec SHA256 fc1b248bea13989383e12a24628c3330b781cb26b6135f2614323fad7d70cc17
-DIST shelx-20060317-mp.tgz 1208177 RMD160 c7cc95ab65b3ee9323e471ac60b861f246ff67df SHA1 1631237dafefb44a595b70eca71305679d569e96 SHA256 00c3254269404b704f8ceb5ee45c0ab71b57b4bbb04f1b72a188dd18ccced7d2
-DIST shelx-20060317.tgz 527162 RMD160 4a72471cca8a1df8839815ec7df35349817f7f31 SHA1 3ed6481e716059441253c84500965837deddf01b SHA256 8edb841fa71cae420e65fa87fdb3d829359a199aeead6522c72a08c4f72307d9
-EBUILD shelx-20060317-r1.ebuild 1782 RMD160 852452cc85194c26e9edc7c1d63475554d10ef2c SHA1 78524cef2dadac622e9633651f8f3330b67e747f SHA256 11ac22f1559b925f5c079323834b16024567e7336623047d13f9722b08d34259
-MISC ChangeLog 3089 RMD160 552036c40e95765a6bd9098332acd1d1ea5179bd SHA1 bc864dafe7273984fdc3467f766ea6c592d630db SHA256 10e6ff564e0e66e9cc983cf0b5106a948a23676d183bf5cd410a767e781a3269
-MISC metadata.xml 282 RMD160 16d508f4c6b6be0acbef265424b80ba31a6012f7 SHA1 edfb925bd075861e7045d34893ceb0fc48d87dd5 SHA256 0994e2adaeab98462d4ed63328b307a322f061794a4d06e8e5e68845050ddd13
+AUX 20060317-autotool.patch 1218 SHA256 6c41666ddb019d8ad42413723247fd8cda76e0b754e8fdce5734a6a4ba5ba9b8 SHA512 1203bd2a1a477f49ed8b15bf396a010064ba4bffbd832f063bca3b02381ce8a1bfba19650cad9ae201a23bf283ad14d250b8786272fa2aaca5494a7ddbf6a92d WHIRLPOOL 5bada38508ea7576cfa9ad771ab29014cec9b4245fff100a2f2b21bbb903061c584373d77f0eb11839225b186abd2be20dfb25a8eea4ebf7527432772935fc53
+AUX 20060317-gfortran.patch 686 SHA256 fc1b248bea13989383e12a24628c3330b781cb26b6135f2614323fad7d70cc17 SHA512 ddbb3e49d90593be18e7ffc1b13aa75d160361f051285074a0753950d29439918158568fa60f814278931e2c58272401dce2f864a16214774a5e4bdbd7e2511b WHIRLPOOL 5bcc494046d6f831e6f7c4891f5da276f9823e5176dac8109da28169ca5bc61d364cde7e5ca856e8789252be55d8af3248b0fbf2fd58276e160c3895d9480294
+DIST shelx-20060317-mp.tgz 1208177 SHA256 00c3254269404b704f8ceb5ee45c0ab71b57b4bbb04f1b72a188dd18ccced7d2 SHA512 42358b65b44ef6ca5f570880348c733f5255dcad12f8a83b50f59e32d33e23ff32d462c0c5cffcbbdac7c5b8f40cdac3d4f98f70e5a3f1b3528d79972b252d10 WHIRLPOOL 4917a5235b12444f2c7dd91378a303186ab2319239f3a8d573b4b0159145cd3674eaa8f2ba9d5e89a85a88d0a0e9072058494fb10d34f99e37cf42d8838a9f92
+DIST shelx-20060317.tgz 527162 SHA256 8edb841fa71cae420e65fa87fdb3d829359a199aeead6522c72a08c4f72307d9 SHA512 80d70bd157ae8b1ef81b6a4ba6feb0497a2983a8c888f875e6642f4c35b4263083c9d0f59bb11b42595d09a4035157f7faf0e6decd3f93597225d52f8a779995 WHIRLPOOL a55aae2c768dd8fd263f906440c8c9e90b6164bfbfa194f6b58fea3b35b1d4406b6bdfcc7417fc1179782afb6f3f65519d4b3e4915d27597282512dc371b6c84
+EBUILD shelx-20060317-r1.ebuild 1732 SHA256 ae99d8e6992bbcdebb2b9ee5612016618ed458ef09a699722c2637b4aa5bf489 SHA512 7846eaac52141bd3266411141c7bef9b10389851877d85b16f2613ea1999a4e7739e358570edfd09d6b2be754f1de57b21cc3d9a22d6b6ea7e72c286ade28f57 WHIRLPOOL 02c470e02972959251d8aaab45218a9b193b7c654dcc6c5291244f8a290ca18c1c9df4b15b417baabc7bc06013b1f5d81d958e2f7edc3a3b7b6741b36c68b409
+MISC ChangeLog 3284 SHA256 04140f9dea89369d9aa5214ce229cce65f1a982ae1b6426bbd3839b21f6de20a SHA512 49d8c00c7933a833dcdc3ac8f459d65f4c37a5f34a48a8e812720e36836fa816a8da2d0a36535141ff34f3ee12c6363b59b60cbcb0ef7baf5e25be3fac9b37ce WHIRLPOOL 5c8f487a2fe20cde8d8392e8166b44eb1b51ce1857aa112a2f5147927a264ee5ed3eea5ef81c528f2bbd64478fe72869b1cc14ff3e34aba9bff77e452b851eef
+MISC metadata.xml 285 SHA256 3a992c4849b07535e8802efe87db07534a2b6b6e40b63200c5f6011627ff317c SHA512 bdb84db6da14cd041e7b04eb9f5ec89fcee583a6fde1499e083c3e802bcf4302d907a491632f351a05100a2a9e6a46319bbf35c85d08951f3573e669132dd0a4 WHIRLPOOL 47e6c34ef3362e64604e624b6e950995ce770bc88b585f3cdfbb22fc29f5b9c061696af0db25c3fb65751774e9e824f4a37bb51caa98ba89671816d7cffd8a76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk4Av1MACgkQgAnW8HDreRbMwgCfb7AAclJL2gAI+Rx/MWjs6aD/
-dbQAoLa8l21GHBfehJDjShIKIneF5Oe7
-=1Fu+
+iEYEAREIAAYFAlCBK4sACgkQgAnW8HDreRbaxgCgmq7a7iYoyMvPXxoAjZuO7xcY
+9OMAoLCaXcINWxrTqdOFh69yaMb+Oda9
+=wuxQ
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/shelx/metadata.xml b/sci-chemistry/shelx/metadata.xml
index eb6d37d63bca..851c78e7d251 100644
--- a/sci-chemistry/shelx/metadata.xml
+++ b/sci-chemistry/shelx/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<use>
-  <flag name='dosformat'>Use CR/LF to end lines; useful in mixed Linux/Windows
+	<herd>sci-chemistry</herd>
+	<use>
+		<flag name="dosformat">Use CR/LF to end lines; useful in mixed Linux/Windows
     environments</flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/shelx/shelx-20060317-r1.ebuild b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
index 6cd5e6027acc..b530992c1378 100644
--- a/sci-chemistry/shelx/shelx-20060317-r1.ebuild
+++ b/sci-chemistry/shelx/shelx-20060317-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-chemistry/shelx/shelx-20060317-r1.ebuild,v 1.10 2011/06/21 15:57:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317-r1.ebuild,v 1.11 2012/10/19 10:29:30 jlec Exp $
 
 inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs
 
@@ -10,16 +10,11 @@ SRC_URI="
 	${P}.tgz
 	openmp? ( ${P}-mp.tgz )"
 
-LICENSE="free-noncomm"
 SLOT="0"
+LICENSE="free-noncomm"
 KEYWORDS="amd64 ppc x86"
 IUSE="dosformat openmp"
 
-DEPEND="
-	virtual/fortran
-	"
-RDEPEND="${DEPEND}"
-
 S="${WORKDIR}/unix"
 
 RESTRICT="fetch"
@@ -34,8 +29,9 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-autotool.patch
-	epatch "${FILESDIR}"/${PV}-gfortran.patch
+	epatch \
+		"${FILESDIR}"/${PV}-autotool.patch \
+		"${FILESDIR}"/${PV}-gfortran.patch
 
 	if use openmp; then
 		for i in shelxh shelxlv; do