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

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 29 insertions, 27 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/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
 }