sci-chemistry/mopac7: 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, 43 insertions, 50 deletions

diff --git a/sci-chemistry/mopac7/ChangeLog b/sci-chemistry/mopac7/ChangeLog
index cac7db6f8c25..3289a835d21e 100644
--- a/sci-chemistry/mopac7/ChangeLog
+++ b/sci-chemistry/mopac7/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/mopac7
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.29 2011/08/02 14:32:12 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.30 2012/10/19 10:00:39 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> mopac7-1.10-r1.ebuild,
+  mopac7-1.15.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   02 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> mopac7-1.15.ebuild:
   Add ~amd64-linux keyword
diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index faeaa58447b8..afc1f8aa093e 100644
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX Makefile 458 RMD160 c8aff31dc93c6a54977113c122eb280ef8cb26bb SHA1 89c5aa8030d5bd341885f6a2b02ae21ced8e04bf SHA256 5c44af6922cc7cadd7dafc7f26ee9f62c6614ccba2fbdedab365126d2ad8d742
-DIST dcart.f 11044 RMD160 50027f09047cfeef206adeb7fda63791a930974e SHA1 cca3c8cecfa3de584f4dbf39728f29ae120f2e86 SHA256 cdc4082b6b3811eca25eaf674e9345fcd37f58dfbdca3c5d72e9c4e88c47dec9
-DIST gmxmop.f 38956 RMD160 c5fd552d4f50495f9eccdd334eeaedd0a54c5d6f SHA1 40adf9ed741eb7a254d9398e7d3a2f6c77b1f478 SHA256 918bfac91b1dab65f7a8f759c3fd49e40be19bbddb6869d95f8e345830b93b67
-DIST mopac7-1.10.tgz 1596446 RMD160 19c6c97c91d3762269e8add5b2c43c9473efcf90 SHA1 42889de7ac0385a65f87ca4e423a2d2858ce615a SHA256 993ace860c77345d1c8629f416bfc765610b9f264e9885b3777f44b745817ab5
-DIST mopac7-1.15.tar.gz 764547 RMD160 f8be5312ab81832512634676e6332f116382ba8d SHA1 d1c99f14a22cd103ea1fb46a5ebe927975dfa0c2 SHA256 6d7ac5d78522db70f7794fd816cea32829cfa9e93774202fe80ba5a54375fbaa
-EBUILD mopac7-1.10-r1.ebuild 1562 RMD160 4d556d59cab6ff95deeff0647e53f436a1ac2b1a SHA1 180b54424c7a09b3860d8d91e3aa01d3a5b86c46 SHA256 50b04bb1cf916a609afd424ac8a3a571383ad492a80ffe50603a214e94bae4d9
-EBUILD mopac7-1.15.ebuild 2218 RMD160 8d088cab1ae64587a3678661df800ae27007399a SHA1 4f19c52b732053a8efd56e143e173993a2898d33 SHA256 b267f37a33bda28413723f0bfbb8bfbef5ccf74f7feefa8bab2ae07d11c1f7dd
-MISC ChangeLog 4565 RMD160 deeeb551ea87d53a00cda0ce8aa1f84d53c5da5b SHA1 7bd876bd3b5a47c9b14a781a3e110e8f3de437c1 SHA256 614e7738e092ad39f84dea1673791bc5fc2eb86de9df89da97fb9fe1c1ec6154
-MISC metadata.xml 242 RMD160 b83241de8abc708e091922c42bd51e7117360210 SHA1 4879d2436be7fba10d077d89195924dc21cefcae SHA256 4a599a4804bdc7b6513b831308e50aac7184e674be503dd31dd79ad7d76da53e
+AUX Makefile 458 SHA256 5c44af6922cc7cadd7dafc7f26ee9f62c6614ccba2fbdedab365126d2ad8d742 SHA512 e127a839ea7363e0ad68e522311e953900d262c6712bd7fcb58d971ff0a80d0d587c8f9d43f698f2295b2ec218a31aad47259c4a42925064110b4ff46a6d62b5 WHIRLPOOL 8bf67d88814908c55bffc152c6a0d2cda3b6f59fc4318811e49857110174b1d4b354828cb30898d3513eb72a652233ad1e6b7c0c352b15385f8b7b30c52c6775
+DIST dcart.f 11044 SHA256 cdc4082b6b3811eca25eaf674e9345fcd37f58dfbdca3c5d72e9c4e88c47dec9
+DIST gmxmop.f 38956 SHA256 918bfac91b1dab65f7a8f759c3fd49e40be19bbddb6869d95f8e345830b93b67
+DIST mopac7-1.10.tgz 1596446 SHA256 993ace860c77345d1c8629f416bfc765610b9f264e9885b3777f44b745817ab5
+DIST mopac7-1.15.tar.gz 764547 SHA256 6d7ac5d78522db70f7794fd816cea32829cfa9e93774202fe80ba5a54375fbaa
+EBUILD mopac7-1.10-r1.ebuild 1552 SHA256 6f3d01619981c6e5e4ab3121166b43d3f8a96300dfe9277f3106a0dee6dba4da SHA512 8a148e5181f67a27fab728d987f26bffc3a097a9e5c2a42815f41f9827269ccddf72bfc73972bbcf4d62880be89d7394299f3bf3d346986841bbb25c296ce218 WHIRLPOOL d785454545675df0bbb1be133cbd6cbcfeb000357d7a2aff4e8c0548dccad22e37804d0bc2d7fbba251ff84580424a8655ba84ec456128fafb8b33dbff318222
+EBUILD mopac7-1.15.ebuild 2148 SHA256 9ada7be98ea84dbefe3b08e2bd611906ad7195f8212cf1e9d2e199095edbd2f4 SHA512 71919b1fc15cb783913e8d41789fb071ae2ea59b54800131018edc9dc827d63d00bbd0b0527d232f7ad91bb3237a9df205dbd7d7e6917da6f0ed1a53c2ac93d8 WHIRLPOOL eaf9b322deb15db4693845057d1a578d70cfe8fb4f060881dcbd6f594867aaec2876d91a671e00fafbd895e9c82fda1eb040df35e5bab9267fcba2e854bcc651
+MISC ChangeLog 4775 SHA256 fc4b08e5a467ed47dafc22c77ae37782adc90d5173083308d0760a49cc163b53 SHA512 d08c07977aead9a8cb625a970e2b7cc136e0b294677c611d92e5527f47c5ef95c0d8c0dc6c050d09dc8ace190993b4b7dfc105db98352d844170df72f771685d WHIRLPOOL 3e42e8ae029ee2b43d4a5662029b5acba3e60e3d814b67f9e020a6044e4cd040b7d4d6fd7affbf9b5fc8a4428ad8c90b2663dc46620ab3693144ac605a749b94
+MISC metadata.xml 246 SHA256 08d762761a0c00fbc9ba0b9f8b3a81b95b4826fb5e588e7352dc8917f0e96b92 SHA512 ae71df3b5ae158b85e0353a16985d646e78fa8b0c0483922266d804a8064dea1b96f801cf494d8c66a38543b94962447784083ef98fc417b2216b2818bb968fa WHIRLPOOL 597c8d1843b09e7ca556a499988c20e4a420615e7fd8d2774703e595fd7cbcbd85794ac525b12a644974f3fcc25e6851d8187e91a257503eba430f285f399657
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJOOApnAAoJEOf+E+/4L5LmDj8P/j8enhTANulUf+wB32T43Io/
-Mw+4rMVbmDr+rnW4wsn68elkYSuqDT7Ilh9XWxqxr//N8WkJWa/e4zYc2knGESZ/
-bhhdq7qeSJT5pmTXKcGu93TAZOoGJcnYObzdpMndgDTL0Ubj6iYFG5micZlwEl80
-IaB03V5uzDHKH4NbeEGkjnW+k+FSPsAaTM+dc/EeRQtVz6wHmlNOsz0ClbeJtaQK
-eCGQLudZ6Aef4PYccSP0MawFMPY4m5G8Oy+sV3ATTsrHd9m2prEXSvhmJQJaINsm
-AT6BPUwDtRcTabC57fwSNIwrf2o9tKHvVUsconJEouCZtirtnsSrIJF/+TnvI4u1
-+itwrvlj1dKRCjA6JH/YlXzzCKB2beam+cjCbw8M5XiP3OAGtX4Qpxkflei7mTVv
-E/LXpN21UiVdyBfCy02AwwDsS+T3zmxiti84+tKmQNwEYKet4OuXuIwauJMJdw/5
-ghdCd4n59jYRBkQx99ygSzVYINKhSaXwbC2UXyISmpIB82YYYYdzAayaPZxTfmMM
-Nzzjezgly6TW94o286WUDyaUCEfrRLbVtPH4qe2+fxyXuiu+cp8Ovvro8NJ6b30z
-wFXelWAhPLxR2E9vQ5pinKQWABrr3N920/oz8tWDqYoQvaFO0Mr28tm9P+QbTWsv
-dhveBBYSRkf3L9/51EGO
-=n0qm
+iEYEAREIAAYFAlCBJMgACgkQgAnW8HDreRYyoQCeJd4tcV0T+BlnRex8q/Lkslqs
+w1EAoJWd1K4O0hu+MK5UW/l9/7vXC0Sr
+=WT+2
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mopac7/metadata.xml b/sci-chemistry/mopac7/metadata.xml
index e83e17cd8807..99c3f3e5f7e1 100644
--- a/sci-chemistry/mopac7/metadata.xml
+++ b/sci-chemistry/mopac7/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-chemistry</herd>
-<use>
-	<flag name="gmxmopac7">Add support library for gromacs</flag>
-</use>
+	<herd>sci-chemistry</herd>
+	<use>
+		<flag name="gmxmopac7">Add support library for gromacs</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild
index f4e9d1cc2405..6103f3fde2b4 100644
--- a/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.10-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/mopac7/mopac7-1.10-r1.ebuild,v 1.7 2011/06/21 16:02:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.10-r1.ebuild,v 1.8 2012/10/19 10:00:39 jlec Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -9,13 +9,13 @@ inherit autotools fortran-2
 DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
 HOMEPAGE="http://sourceforge.net/projects/mopac7/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-LICENSE="mopac7"
+
 SLOT="0"
+LICENSE="mopac7"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
-RDEPEND="
-	virtual/fortran
-	dev-libs/libf2c"
+
+RDEPEND="dev-libs/libf2c"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -50,5 +50,5 @@ src_install() {
 	sed -i "s:./src/mopac7:mopac7:g" run_mopac7
 
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS README ChangeLog
+	dodoc AUTHORS README ChangeLog || die
 }
diff --git a/sci-chemistry/mopac7/mopac7-1.15.ebuild b/sci-chemistry/mopac7/mopac7-1.15.ebuild
index df55422facfc..982720090391 100644
--- a/sci-chemistry/mopac7/mopac7-1.15.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15.ebuild
@@ -1,8 +1,8 @@
-# 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/mopac7/mopac7-1.15.ebuild,v 1.8 2011/08/02 14:32:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.15.ebuild,v 1.9 2012/10/19 10:00:39 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit autotools fortran-2 toolchain-funcs
 
@@ -13,14 +13,12 @@ SRC_URI="
 	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f
 	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f"
 
-LICENSE="mopac7"
 SLOT="0"
+LICENSE="mopac7"
 KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="gmxmopac7 static-libs"
 
-DEPEND="
-	virtual/fortran
-	dev-libs/libf2c"
+DEPEND="dev-libs/libf2c"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -45,18 +43,17 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
+	emake
 	if use gmxmopac7; then
 		einfo "Making mopac7 lib for gromacs"
 		mkdir "${S}"/fortran/libgmxmopac7 && cd "${S}"/fortran/libgmxmopac7
 		cp -f ../SIZES ../*.f "${FILESDIR}"/Makefile . || die
-		emake clean || die
+		emake clean
 		cp -f "${DISTDIR}"/gmxmop.f "${DISTDIR}"/dcart.f . || die
 		sed "s:GENTOOVERSION:${PV}:g" -i Makefile
-		emake \
-			FC=$(tc-getFC) || die
+		emake FC=$(tc-getFC)
 		if use static-libs; then
-			emake static || die
+			emake static
 		fi
 	fi
 }
@@ -70,9 +67,9 @@ src_install() {
 	dodoc AUTHORS README ChangeLog
 	if use gmxmopac7; then
 		cd "${S}"/fortran/libgmxmopac7
-		dolib.so libgmxmopac7.so* || die
+		dolib.so libgmxmopac7.so*
 		if use static-libs; then
-			dolib.a libgmxmopac7.a || die
+			dolib.a libgmxmopac7.a
 		fi
 	fi
 }