sci-chemistry/ambertools: 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, 33 insertions, 36 deletions

diff --git a/sci-chemistry/ambertools/ChangeLog b/sci-chemistry/ambertools/ChangeLog
index dd4aa679aa35..b10f3ced122e 100644
--- a/sci-chemistry/ambertools/ChangeLog
+++ b/sci-chemistry/ambertools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ambertools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ChangeLog,v 1.2 2011/08/02 14:42:37 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ChangeLog,v 1.3 2012/10/19 07:15:43 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> ambertools-1.5-r1.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> ambertools-1.5-r1.ebuild:
   Add ~amd64-linux keyword
diff --git a/sci-chemistry/ambertools/Manifest b/sci-chemistry/ambertools/Manifest
index 78ae0a482781..66199720bb91 100644
--- a/sci-chemistry/ambertools/Manifest
+++ b/sci-chemistry/ambertools/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ambertools-1.5-gentoo.patch 14083 RMD160 762c52626c4eda51839caf74c001bb660052706a SHA1 ab0afa1f5b73569539515dba4cf6638a594c7d6e SHA256 82a83f660701c192272e79f5bab17a8a8be945d78fdab454ade3918281749922
-DIST AmberTools-1.5.tar.bz2 121062582 RMD160 4a086b42c378f0904f7bf0b16adb042f1677be55 SHA1 92e47e7337fb4901a5a145d808c5ffd42c82d08d SHA256 0c7d397d2e91603bb9123ae68e91af3525269e60800ced360f68c13350651d7c
-DIST ambertools-1.5-bugfix_1-10.patch.xz 31708 RMD160 6366e6cae9084a2de96102fc75049bc982a23bfa SHA1 248f088131e8f0efa6d61ae3afbff64571551032 SHA256 5773aaa8a2478ad478f0f3afafaa39669002c31ebe755c0d12ff277ce9ab8352
-EBUILD ambertools-1.5-r1.ebuild 3462 RMD160 4b30dad3efaf122308377409986aa70d235d3579 SHA1 f5e6b789cfaa50e90d369ddacb41e4e1028103c4 SHA256 0119c8866cc1edb70eef04ffda824e906ef20c2f6a0c7c69f0298869e9748f6d
-MISC ChangeLog 517 RMD160 03c0fc9e735ea7d38dc5126f7a66c2e39428c222 SHA1 7dba6187710962271558dc3419793c1d268698d8 SHA256 35eca6619cf431d2f3fe1539a02542df3a2a2239ee0ed351ef38c8b51b4983dc
-MISC metadata.xml 263 RMD160 9484584cc295931e963dc785e211261f68e48c82 SHA1 a2c5af57c8eb879a4249fc0240432a4fc5b91ca5 SHA256 0e94df6d8502bc41ccd18ec4d570490e245c08595e837fd116a255458939e69b
+AUX ambertools-1.5-gentoo.patch 14083 SHA256 82a83f660701c192272e79f5bab17a8a8be945d78fdab454ade3918281749922 SHA512 aac8f401a96142be8ccd20b640ad8425e637bfc319d76d3b9b5b535e9448fb78a87fa7b211d1cc6221601cb530a606e717800af76e1d6df340768eb2e1059d2c WHIRLPOOL d4a4df283ffddc35a1326c2aa992732428a4687cf0c4bcf354991396b16ee454c266b46273daeeea6c58efd8fdcdd19140c4c51eb39cedafb64ad45bf5dd28c5
+DIST AmberTools-1.5.tar.bz2 121062582 SHA256 0c7d397d2e91603bb9123ae68e91af3525269e60800ced360f68c13350651d7c
+DIST ambertools-1.5-bugfix_1-10.patch.xz 31708 SHA256 5773aaa8a2478ad478f0f3afafaa39669002c31ebe755c0d12ff277ce9ab8352
+EBUILD ambertools-1.5-r1.ebuild 3462 SHA256 975df0aae8c7a263f6763bd466154909d1ba05c38d89991f83d8a29707f1ec32 SHA512 c233cab094ec75daacaae4acac3617821a41cd57366f95711436724e93a47d4e44c8aca51e1aab61c00043878c8569703efd6c81a641e1271f1265e4053014d7 WHIRLPOOL df2608675c1bdb3ee641731cf3e1f5d3238040f0b2350d21d3b60b6612c95bf338ae64ffe554dc83434cb7ef234294cd7797cbf771bd878a6803f4baca49b992
+MISC ChangeLog 710 SHA256 524a2337221539826a4abae272a20d801aac754512d447d78ade5fd913bc4ba5 SHA512 04ddb2431ec5fb1391696c2f47a400dbe2aff720273823dc12c5d48c8bbd10bcb2fcb0162e6e69332967c782b70973548e555b90b09c0cbacefc38e15cbd7b91 WHIRLPOOL 2ea07f57f44ea121ba40145ed76498694626ddb1bf59f6d61d8b53d35298b49d6b56ca42de68320593e5561c506a7086a04454d8e4588c2a6c3e69ad16c1962c
+MISC metadata.xml 262 SHA256 3545a7acb49dae4eeb1e9934f6ab2a1dfbe2e1b772fe9a503cf0b6fa1f5457de SHA512 a49fb1b9b981192f41e43a4120d8f5ac488982eebcb4f0fe5d23a50183e781574e8acb3dc2482036c0011836abfdd65a61f07756d8a99f0ebd48dba49e04a3db WHIRLPOOL 6426916c89261f8d4a98aadc8e37bf7689f9e73d387786e9e17ed6d743732093df55b490dcacc599e32eeec43a26d4d486cee6cb9316594389684ebfa8a364dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJOOAzhAAoJEOf+E+/4L5LmnskP/RDNwmWLOUBpfIeTumanZ6F4
-POm+NOKPid5owfucmWANf88zF6GqlHkv7IevsXjvQfBteNJcE8A34WfOfkkSJvUk
-q5aKXfqXBHvFPlpRMgAeozlxoGKEVGPusuS7gX/CqSaMsnHv5tKxlt+46onxJO1O
-rRtFpsQS4Ii9vlcwmfp8uboVHJk2DgQtFRLzSJDDczCdYgIeUTpPFt4U49h/NSNk
-UaZTKhGPBMUBkMW6UMQDQmL0rkDR3k9vBNzeyJKdKbueEpe3Ou27G6KIDDLpi5Dp
-TSIlRkW4mVIUuJAOPNGgbDVp/7nVdmx7PgFCEb7ML2IemkDiw6hNZe9jqNIvLJ8V
-WT/36sTVXAkCJrOD/SJR79kKuUB0ZwwysjIixbB0lwSPLeXUE1znptxM5w4cbKn1
-fqMhEcGglfds3Ga2fvh+jvl463FyQVeHtdzcwwRDbH1Q1/SLsHVlyfJhp7i9HdKq
-LH3LDaonvZ5S0HxdETczf8H4Hj3W7gzvfqvD5B+2hqMtq3RPjn6+ZacWSYYLUQA3
-ZO8dSdcNet775l1iHMlFmmHqPdl7vpbbhrCdnnQboSCM1hoEzkgznbRZeu/+mawO
-cmA02tN793YT6ILMSrJUJHNZfkL8dtRXuoVkFc6fFrvjRYZ1WM7Xbu/FVI8jsCqF
-XmLEVskr2jeLP1ZEm6ik
-=mSva
+iEYEAREIAAYFAlCA/iAACgkQgAnW8HDreRYU/wCfeHHrHeOemeQjEc8DoEFfiA1E
+DesAmQG5fgOXf3wkNN7ULAPHbnS3Ls4/
+=8rz0
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild b/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
index 0c001bbf3a3f..97412b86a44c 100644
--- a/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.5-r1.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/ambertools/ambertools-1.5-r1.ebuild,v 1.2 2011/08/02 14:42:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ambertools/ambertools-1.5-r1.ebuild,v 1.3 2012/10/19 07:15:43 jlec Exp $
 
 EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs
+inherit eutils fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="A suite for carrying out complete molecular mechanics investigations"
 HOMEPAGE="http://ambermd.org/#AmberTools"
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="mpi openmp X"
+IUSE="mpi openmp static-libs X"
 
 RESTRICT="fetch"
 
@@ -28,8 +28,7 @@ RDEPEND="
 	sci-chemistry/mopac7
 	sci-libs/netcdf
 	sci-libs/fftw:2.1
-	sci-chemistry/reduce
-	virtual/fortran"
+	sci-chemistry/reduce"
 DEPEND="${RDEPEND}
 	dev-util/byacc
 	dev-libs/libf2c
@@ -100,7 +99,7 @@ src_configure() {
 
 src_compile() {
 	cd AmberTools/src
-	emake || die
+	emake
 }
 
 src_install() {
@@ -116,23 +115,26 @@ src_install() {
 	# Make symlinks untill binpath for amber will be fixed
 	dodir /usr/share/${PN}/bin
 	cd "${ED}/usr/bin"
-	for x in *
-		do dosym /usr/bin/${x} /usr/share/${PN}/bin/${x}
+	for x in *; do
+		dosym /usr/bin/${x} /usr/share/${PN}/bin/${x}
 	done
 	cd "${S}"
 #	sed -e "s:\$AMBERHOME/dat:\$AMBERHOME/share/ambertools/dat:g" \
 #		-i "${ED}/usr/bin/xleap" \
 #		-i "${ED}/usr/bin/tleap" || die
 	dodoc doc/AmberTools.pdf doc/leap_pg.pdf
-	dolib.a lib/*
+
+	use static-libs && dolib.a lib/*
+
 	insinto /usr/include/${PN}
 	doins include/*
+
 	insinto /usr/share/${PN}
 	doins -r dat
+
 	cd AmberTools
-	doins -r benchmarks
-	doins -r examples
-	doins -r test
+	doins -r benchmarks examples test
+
 	cat >> "${T}"/99ambertools <<- EOF
 	AMBERHOME="${EPREFIX}/usr/share/ambertools"
 	EOF
diff --git a/sci-chemistry/ambertools/metadata.xml b/sci-chemistry/ambertools/metadata.xml
index 20e218e23967..b2558d8c6282 100644
--- a/sci-chemistry/ambertools/metadata.xml
+++ b/sci-chemistry/ambertools/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Alexey Shvetsov</name>
 	</maintainer>
 </pkgmetadata>
-