sci-chemistry/procheck: 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, 26 insertions, 28 deletions

diff --git a/sci-chemistry/procheck/ChangeLog b/sci-chemistry/procheck/ChangeLog
index 89b30d04b282..f7473ca242e5 100644
--- a/sci-chemistry/procheck/ChangeLog
+++ b/sci-chemistry/procheck/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/procheck
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/ChangeLog,v 1.8 2012/07/09 19:01:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/ChangeLog,v 1.9 2012/10/19 10:20:35 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> procheck-3.5.4-r1.ebuild,
+  metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   09 Jul 2012; Johannes Huber <johu@gentoo.org> procheck-3.5.4-r1.ebuild:
   Stable for x86, wrt bug #419877
diff --git a/sci-chemistry/procheck/Manifest b/sci-chemistry/procheck/Manifest
index 9aa1b8543861..cabae060967a 100644
--- a/sci-chemistry/procheck/Manifest
+++ b/sci-chemistry/procheck/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.5.4-ldflags.patch 1649 SHA256 d46c5f8fbb6d7f6f1fedc522f311ae4c5baa12b9ff47e6d3970312e1b2b34e57 SHA512 f7f2e06a77058f7e743a1c1367d40c2683a2aefbf2910a807d1b0a77d19024446f978ec34a8e5187338a7e98b6651592a37c024e8a2ea955d9bd736d47bfeb4f WHIRLPOOL 1b4c6b1563251d2b37edfcdaeb49c8c963559c1823a3cf724e78c6f8a2ba4e53fd79b0da4a40339a55a608f470c3db38c5869cc4c058cf5bc9cc21cf8ee77b52
 DIST procheck-3.5.4-README 6585 SHA256 202d5b4d9ffaebdad19c368e6e6fd8ab54744c511609b1c609ef46c21fa0ffa0
 DIST procheck-3.5.4-manual.tar.gz 517840 SHA256 3c2faa505be05102ccbe23473abdddc1cd4dc87c6b5e74222b7ea5c27b18db5a
 DIST procheck-3.5.4.tar.gz 522013 SHA256 4923fe5a7b86d5369fd639d0c77cfb866e574f076ec8c52424d746e843a404f4
-EBUILD procheck-3.5.4-r1.ebuild 1860 SHA256 54573fa65ae6a84e5fcb76678d7996c87575cfe2fe500b1c2bcb7e286ec1054d SHA512 1d41446d0f0064398f9ed7055fd7ed7441c342c677ca42852149e053dde921cf92ce57e6f17ad6dbf9c451c0455f8b547195ad7dae4651fc4136d2d25dede301 WHIRLPOOL 15b103caa684a6bbf1b3e841b8a081ec899da8df9fad446b306d51f52c1ae4e2bf4e6b525a2bc704b602e97b876e792d006507cb0cdfc70c42506dc7b30a5bb2
-MISC ChangeLog 1197 SHA256 788e43a29a9abcc4ff258f8ba69d2e51892f8e38c11f81ca7c5d11c0f2dbe585 SHA512 fed8bf6d2137c18f46f07bd70bae1e51963a6f77bbc2e5fdcc12da1d348e77746511ce94ef832168fb474c52442eacf758cdb80cce7a6fc14b15eca71264f178 WHIRLPOOL 109a8365d012f858f92a3679c711a981d3a2834b03acf1c03b3e1f253093e3731a9bc96a7ef81ecf8018a8a1ba0b88eacc95f2ed38ba9d6014e3dd56ab07d2e3
-MISC metadata.xml 249 SHA256 c3f71fe107b700acc3c21923ed360604cfd47ac3181d9ed7605a0472250a8064 SHA512 6f4c9d95407b74c49ea0327f5f0e643eaf788ef88ba004c9b38ef06cd3cf1ba9c98976ed108ac1dfc720820bd23445fe4ba91723b2ea2989e1b89ad0cd7b8c64 WHIRLPOOL 1be14f4a9c82a8a4e8fbe5a0cf82260cdd6149ecc7956256785ed2698445cba9fb4362609971f69b86b87b6354dc4e8e69ed77357d29b73b831ab7c31ffd2dac
+EBUILD procheck-3.5.4-r1.ebuild 1773 SHA256 e2bfae5fb806fd7647c071a7180ff38b7001187e713612b1b66091e9c2c5fbd4 SHA512 90ebec3223a575f7010e27015fac8c3f0aef013d56fe470aea95f4869902195e334a394ab2b81b6d2629ddd2b08fb7d216449ef96db4b5f9aa70cf15437f254a WHIRLPOOL 7b8a4adb8ce68645fcc269ed7a09287ee29a9e0bff4d9a4abbbd8e85573a1ea4bf0fd22dafb15fc8a09b4a0764225ba2efb033bf2565a6e48a994a4139b9604a
+MISC ChangeLog 1392 SHA256 95c04945920b03b53ccaf9cb881ef753d1dae79f2f2d4e7fb0edcafa5e926ce2 SHA512 64b2cfeb6f2f35476950c4b513f71e642c11a97e15f1b8cd19730734a95dc92170462a7ace2e2cdbe4beb2cce725f9764acf24d8c81cb8d515b10f38e530a44b WHIRLPOOL 3704bd5f226ebdb95bec8c71affba7bebdbb65812b4fdb0037f8c42279f030bb74ab693da06785a7a953655088e4fec700816177485e6a835fcbee818fe057bc
+MISC metadata.xml 248 SHA256 def85170feef518c4e137426a1fabc0b71ebc6c14c1d9ecd856be855b9705173 SHA512 cd725e1de90ff139a64d2e3fe19eb203fa56432f6b6254faf45cc7b72ab01f4d0e64a3300afefec58dbc510992ca888e1321394db52d3048c2b31de8b5c6b607 WHIRLPOOL a420a54d6e7f6c446bbd6465b59d448dc86e5872bf2dcc3de45f434e4147dd03e75997fed859670bf5003cb666f1ca26485bb43bf0208c91cb6f82003db16433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBCgAGBQJP+yp5AAoJEO+t9ga+3I3a6tQH/iP8/XkfKrMX46jz/72RyrBT
-8YbAlvD21vA5SQUnvK4ydIwbd+lmu26yI95Zogk20ZWVtHwAPOX3IkB+v8J1s5ui
-yP2QS+ZYqJetwcVehtKStAvLumFnu1ivkl+71euMObcqOMxNzK/ZL27RQkdXwrlr
-Y7t9Krp6yurH0JAALism1lojoFKDHNSmneiqjvLStyzk7fYoF+xKoYM5y4Zq67qs
-kLqqNk/rRDEcYlXvysbcVMgevxiV/+dn7X48rwHP+zWmh4RLh05IzWw9r2G/IhB3
-bpc3gas6Fru8pKg7FiV3KIJWArz4T453gSSOncXv+tE59bH0SajyTByvG6qBJX8=
-=k8yM
+iEYEAREIAAYFAlCBKXQACgkQgAnW8HDreRZOAACeK0rmo+B8IX5Gt1yRt0gz8wPE
+DGQAoJKZLAdySSodmWMz6mbhrjWaS9CT
+=//xR
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/procheck/metadata.xml b/sci-chemistry/procheck/metadata.xml
index 8487320ca2a0..04b998aabe31 100644
--- a/sci-chemistry/procheck/metadata.xml
+++ b/sci-chemistry/procheck/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Justin Lecher</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild b/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
index 995157d9dbbe..ddf5470acffc 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.6 2012/07/09 19:01:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.7 2012/10/19 10:20:35 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs versionator
+inherit eutils fortran-2 multilib toolchain-funcs versionator
 
 DESCRIPTION="Checks the stereochemical quality of a protein structure"
 HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html"
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-RDEPEND="
-	virtual/fortran
-	app-shells/tcsh"
+RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
 RESTRICT="fetch"
@@ -46,13 +44,12 @@ src_compile() {
 		F77=$(tc-getFC) \
 		CC=$(tc-getCC) \
 		COPTS="${CFLAGS}" \
-		FOPTS="${FFLAGS}" \
-		|| die "emake failed"
+		FOPTS="${FFLAGS}"
 }
 
 src_install() {
 	for i in *.scr; do
-		newbin ${i} ${i%.scr} || die
+		newbin ${i} ${i%.scr}
 	done
 
 	exeinto /usr/$(get_libdir)/${PN}/
@@ -69,22 +66,22 @@ src_install() {
 		vplot \
 		viol2pdb \
 		wirplot \
-		nb || die
-	dodoc "${DISTDIR}"/${P}-README || die
+		nb
+	dodoc "${DISTDIR}"/${P}-README
 
 	insinto /usr/$(get_libdir)/${PN}/
-	doins *.dat *.prm || die
-	newins resdefs.dat resdefs.data || die
+	doins *.dat *.prm
+	newins resdefs.dat resdefs.data
 
 	cat >> "${T}"/30${PN} <<- EOF
 	prodir="${EPREFIX}/usr/$(get_libdir)/${PN}/"
 	EOF
 
-	doenvd "${T}"/30${PN} || die
+	doenvd "${T}"/30${PN}
 
 	if use doc; then
 		pushd "${WORKDIR}"
-			dohtml -r manual || die
+			dohtml -r manual
 		popd
 	fi
 }