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

diff --git a/sci-chemistry/aqua/ChangeLog b/sci-chemistry/aqua/ChangeLog
index 78c4c1828807..d9f8f9127da0 100644
--- a/sci-chemistry/aqua/ChangeLog
+++ b/sci-chemistry/aqua/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/aqua
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aqua/ChangeLog,v 1.7 2011/06/21 16:05:51 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aqua/ChangeLog,v 1.8 2012/10/19 09:38:53 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> aqua-3.2-r2.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> aqua-3.2-r2.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-chemistry/aqua/Manifest b/sci-chemistry/aqua/Manifest
index 691dc4045bac..f6a30859708e 100644
--- a/sci-chemistry/aqua/Manifest
+++ b/sci-chemistry/aqua/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 3.2-flags.patch 4082 RMD160 7aea18ee558eab5458614058948c20def57dad28 SHA1 ed79bf1c643b1ade23c6e1d7a3c9e20edb9f5cca SHA256 3fe701b69bb174fd0c8c7b9227e5538947f82f78dfe47f534fba99cca8b284c1
-DIST aqua-3.2-nmr_manual.tar.gz 632031 RMD160 23d98ccd958a55e3c81f40ebf1884ccba1dc4653 SHA1 388d742763279b63476713da0fc9a6b5d855e966 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996
-DIST aqua3.2.tar.gz 688408 RMD160 df72a47295f4c9509e9342241562a88458955eb5 SHA1 92c65374a8ba500fe493cb1752a81bfd857853ac SHA256 895291b1771f4db5b4a010ce797400a8c4d84095bf34d660dd3405223419242f
-EBUILD aqua-3.2-r2.ebuild 2324 RMD160 b0c4a552d2a14fa1528ef1405a4e1021829a085e SHA1 90cbd1384d455734670ae5c78f9f4795bd46790f SHA256 40e3ff3bac5c8f905a1914b5bb2c82cb1ccdc5c217b168995b88c4537fc7197d
-MISC ChangeLog 1045 RMD160 f046b71731e4134c08a79fdc4e7180f1e4dc0725 SHA1 7f5e360b4c92c542945d80046a7d3e8ff0ac33ab SHA256 f410411838d08354520e3a1376abf271e0506d939f334eccc37cbab8416f824f
-MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
+AUX 3.2-flags.patch 4082 SHA256 3fe701b69bb174fd0c8c7b9227e5538947f82f78dfe47f534fba99cca8b284c1 SHA512 f1a8c665c7480db7ddcc871bb4eb92ee6752c396d1d73ad7ce9cea7a70ae9f753a9b7ddc53d3c819b753818513e187e195f5971547fd459445db8913d412e5e8 WHIRLPOOL 0cc035ba0b27f1d45b45292f5b29e9968ff658a5d4b2b546516e71f6c298fe6d2b4a852d5f996e3656b745c4884730b83ba7ac3cecd31c3427c590cf90d3dc63
+DIST aqua-3.2-nmr_manual.tar.gz 632031 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996
+DIST aqua3.2.tar.gz 688408 SHA256 895291b1771f4db5b4a010ce797400a8c4d84095bf34d660dd3405223419242f
+EBUILD aqua-3.2-r2.ebuild 2173 SHA256 d6356b68d0e98a52aae054baca595853fe72b3cc52dde76ee8df5cb254a11ea2 SHA512 d5baa3c9596414e2bb004cf9684382b7613010720845d19f93be14cefaaa2711569a269d5d7afe311e155464f06ff9f2ae7668c7f12dcf590784eb051e0c37c5 WHIRLPOOL 462bb0bd04f0f1cc308dd426b8f0c1ead9ad84f5cfd7c071aa5190732dfac800efbbfaf6788e3661acf72e84ecb698cc24375df7289a6411b641b7a8e5d9f38d
+MISC ChangeLog 1234 SHA256 2e29785d9cd11da6615c45c9a7c47c077c19cefa07b670f0a0167712efdc6b59 SHA512 36243b25e872810d330f05bc488572a1fe334f7b20c0e3b7cd61404647d10f55076b5a55d39dfe353cf65053ae2feefe6b9f8137dc04475b42c0bb5a4c73ac0f WHIRLPOOL c87e94c566d0b2247afb1f7a0a24dee565c5908a67e3fc4726383a0db9baa32655af58e57665f25b1950c31ba77eefc70e7ba901a45792d6943c08b524d69bc2
+MISC metadata.xml 229 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567 SHA512 2e7cece2f0eb384df9ecb83d07ff9082abefd8f1e797006cbda98a018aeab49a48253ae8094cd0298c2ee8279274d707f0c0b2c0665e6273d9bbb432d6b579c9 WHIRLPOOL 44140ec3764af0d7a442dcaaf0b2904dbd279197bfbe014d5388cf8fe5016156237840985b0f3f7603cac3a0cfda3cf83291976e15bfbc8cb82dbfa13d5c451b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk4AwWQACgkQgAnW8HDreRakRACgoG3QX1h2yIP6scnk4EUgJp3o
-//UAn3deKkhbrGnn8AsqfWlhk8XZ2dvC
-=Z8ao
+iEUEAREIAAYFAlCBH64ACgkQgAnW8HDreRZONQCVEF3fZhEITwOnXv5SC3uR1Po4
+wwCcCvxMpBuAqPgScyhC1UU0tXyYgBU=
+=VbT3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/aqua/aqua-3.2-r2.ebuild b/sci-chemistry/aqua/aqua-3.2-r2.ebuild
index d4e1a815f702..c526c68eab88 100644
--- a/sci-chemistry/aqua/aqua-3.2-r2.ebuild
+++ b/sci-chemistry/aqua/aqua-3.2-r2.ebuild
@@ -1,10 +1,10 @@
-# 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/aqua/aqua-3.2-r2.ebuild,v 1.4 2011/06/21 16:05:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aqua/aqua-3.2-r2.ebuild,v 1.5 2012/10/19 09:38:53 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils fortran-2 prefix toolchain-funcs
+inherit eutils fortran-2 toolchain-funcs
 
 DESCRIPTION="Program suite in this distribution calculates restraint violations"
 HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html"
@@ -13,13 +13,11 @@ SRC_URI="
 	doc? ( ${P}-nmr_manual.tar.gz )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="procheck"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="
-	virtual/fortran
-	sci-chemistry/procheck"
+RDEPEND="sci-chemistry/procheck"
 DEPEND=""
 
 RESTRICT="fetch"
@@ -52,45 +50,44 @@ src_compile() {
 		CFLAGS="${CFLAGS} -I../sub/lib" \
 		FFLAGS="${FFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		exth || die
+		exth
 	emake \
 		MYROOT="${WORKDIR}" \
 		CC="$(tc-getCC)" \
 		FC="$(tc-getFC)" \
 		CFLAGS="${CFLAGS} -I../sub/lib" \
 		FFLAGS="${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
+		LDFLAGS="${LDFLAGS}"
 	popd
 }
 
 src_install() {
 	rm -f scripts/conv* || die
-	dobin bin/* scripts/* || die
-	dosym AquaWhat /usr/bin/qwhat || die
-	dosym AquaHow /usr/bin/qhow || die
-	dosym AquaPseudo /usr/bin/qpseudo || die
-	dosym AquaDist /usr/bin/qdist || die
-	dosym AquaCalc /usr/bin/qcalc || die
-	dosym AquaAssign /usr/bin/qassign || die
-	dosym AquaRedun /usr/bin/qredun || die
-	dosym AquaCompl /usr/bin/qcompl || die
+	dobin bin/* scripts/*
+	dosym AquaWhat /usr/bin/qwhat
+	dosym AquaHow /usr/bin/qhow
+	dosym AquaPseudo /usr/bin/qpseudo
+	dosym AquaDist /usr/bin/qdist
+	dosym AquaCalc /usr/bin/qcalc
+	dosym AquaAssign /usr/bin/qassign
+	dosym AquaRedun /usr/bin/qredun
+	dosym AquaCompl /usr/bin/qcompl
 
-	dodoc HISTORY HOW_TO_USE NEW README doc/* || die
-	dohtml html/* || die
+	dodoc HISTORY HOW_TO_USE NEW README doc/*
+	dohtml html/*
 
 	insinto /usr/share/${PN}
-	doins data/* || die
+	doins data/*
 	if use examples; then
-		doins -r exmpls || die
+		doins -r exmpls
 	fi
 
 	if use doc; then
-		dohtml -r manual || die
+		dohtml -r manual
 	fi
 
 	cat >> "${T}"/34aqua <<- EOF
 	AQUADATADIR="${EPREFIX}/usr/share/${PN}"
 	EOF
-	doenvd "${T}"/34aqua || die
+	doenvd "${T}"/34aqua
 }
diff --git a/sci-chemistry/aqua/metadata.xml b/sci-chemistry/aqua/metadata.xml
index dde7ca88a50f..1837bbc07a6e 100644
--- a/sci-chemistry/aqua/metadata.xml
+++ b/sci-chemistry/aqua/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>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>