commit

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

4 files changed, 39 insertions, 29 deletions

diff --git a/sci-chemistry/ambertools/ChangeLog b/sci-chemistry/ambertools/ChangeLog
index 26101af84..ea945fd85 100644
--- a/sci-chemistry/ambertools/ChangeLog
+++ b/sci-chemistry/ambertools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> ambertools-1.4.ebuild,
+  ambertools-1.5.ebuild:
+  Added fortran-2.eclass support
+
 *ambertools-1.5 (04 Jun 2011)
 
   04 Jun 2011; Reinis Danne <rei4dan@gmail.com> +ambertools-1.5.ebuild,
diff --git a/sci-chemistry/ambertools/Manifest b/sci-chemistry/ambertools/Manifest
index 8e1849394..493bee58d 100644
--- a/sci-chemistry/ambertools/Manifest
+++ b/sci-chemistry/ambertools/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ambertools-1.4-bugfix_1-18.patch 365430 RMD160 09bf7da6a1d386af8fc5cb70269442ed82c81866 SHA1 11c8aa73dc11dd2b4794a25fe8bf8c26813024f3 SHA256 9b4e310e02039e07f4b063af13ba360afc88b92912f2e283210be26a89245bfa
 AUX ambertools-1.4-gentoo.patch 9926 RMD160 d84b121e1fa940cbf949855de3a5f0bee7566330 SHA1 08ea41b969bed5320230420d047e71a28333f76c SHA256 8f520c01146a704173ca31c68dc9440e2938263416f6d0c95de22d138426e01f
 AUX ambertools-1.5-bugfix_1-3.patch 142997 RMD160 db9360ec6fca0be4582380bf99e5b981dae9ee77 SHA1 49be38f7650959705516948e5b0c9d27b6f3775f SHA256 f0bb5a30fb9bff698dcbcddd27c5412377a43577a883f7bbf8488c8fffdfbab3
 AUX ambertools-1.5-gentoo.patch 14083 RMD160 762c52626c4eda51839caf74c001bb660052706a SHA1 ab0afa1f5b73569539515dba4cf6638a594c7d6e SHA256 82a83f660701c192272e79f5bab17a8a8be945d78fdab454ade3918281749922
 DIST AmberTools-1.4.tar.bz2 67331137 RMD160 b499e18b583a0b454dd3a554986c19c111822e6a SHA1 ef0f9a44c8767ed35f942fd41afc636b67da0389 SHA256 af61da2f3643b4ec7f41620242b734a3cb4a79c5d422100fbd1fd1c402fecfc1
 DIST AmberTools-1.5.tar.bz2 121062582 RMD160 4a086b42c378f0904f7bf0b16adb042f1677be55 SHA1 92e47e7337fb4901a5a145d808c5ffd42c82d08d SHA256 0c7d397d2e91603bb9123ae68e91af3525269e60800ced360f68c13350651d7c
-EBUILD ambertools-1.4.ebuild 3359 RMD160 a0b078a57fd80f2d0df8fc26d5688d298d82ac5d SHA1 da867732e9c4fa91de6f604548d8fb321aa6e246 SHA256 2825415aabbf92511697aab8ee8904979e9f82e2d4445189f0b99adebe947740
-EBUILD ambertools-1.5.ebuild 3495 RMD160 6ef1dbeeb35c73b1287d7110e517c6fa41e3dad9 SHA1 abf6794ee04f9b6781d90f4b19ca7f56677cb373 SHA256 30764e6655577d2a4e8d979ac31bb3ad7b8ec2922f0ae6045acdcb6dcb5e49a2
-MISC ChangeLog 521 RMD160 d5011b16b7a96cbe8fcde381d04f81c0abdcc428 SHA1 36ef13374ebd6710d65ec40ffacbe43b8d6b519a SHA256 99338ed1207f6925eb8f5af0f088acef63a347da7e12c9e3628dc93208f719f7
+EBUILD ambertools-1.4.ebuild 3140 RMD160 753b4d7d1d0905734b0ec6057da97ab471d95e5f SHA1 46046832aaa7439df526b760ed010dbc9177b5f5 SHA256 e467332e6b0fd329e1319917517a80c46608b4dd8c54f0e4547cefbbaabd1f60
+EBUILD ambertools-1.5.ebuild 3276 RMD160 d0b7625b954eb22fc7bc305de3010808383abd03 SHA1 2ec2b8f0fc64bbe6b8d8c2a348070f38b8396446 SHA256 e453d9d2e5556ecc48c61afc29c3c401b697e6ea48bf784e8ba398f3177d0d14
+MISC ChangeLog 650 RMD160 c07929f50d0f176116cd331adcf458457b0793b6 SHA1 faecbf5a07f67cb9576f15b11c8890dc7860d152 SHA256 d65ff9a34c2f47b7ae68fa6143ae26e71cbcfeac308a016d23310e00aa5c5a22
 MISC metadata.xml 263 RMD160 9484584cc295931e963dc785e211261f68e48c82 SHA1 a2c5af57c8eb879a4249fc0240432a4fc5b91ca5 SHA256 0e94df6d8502bc41ccd18ec4d570490e245c08595e837fd116a255458939e69b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ad2wACgkQgAnW8HDreRbZJACePCVKhBJCbksE9+iaitFJESEv
+AJsAoJ525KyYMLJZ/G+KAFjtv1VB5GL6
+=R5+1
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ambertools/ambertools-1.4.ebuild b/sci-chemistry/ambertools/ambertools-1.4.ebuild
index 9e0e96b48..67e1428c7 100644
--- a/sci-chemistry/ambertools/ambertools-1.4.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.4.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils fortran-2
 
-DESCRIPTION="A suite of programs for carrying out complete molecular mechanics investigations"
+DESCRIPTION="A suite for carrying out complete molecular mechanics investigations"
 HOMEPAGE="http://ambermd.org/#AmberTools"
 SRC_URI="AmberTools-${PV}.tar.bz2"
 
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mpi openmp X"
+
 RESTRICT="fetch"
 
 RDEPEND="
@@ -36,21 +37,18 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build ${PN} with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
+	fortran-2_pkg_setup
+	if use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
 	fi
 	AMBERHOME="${S}"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bugfix_1-18.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch \
+		"${FILESDIR}/${P}-bugfix_1-18.patch" \
+		"${FILESDIR}/${P}-gentoo.patch"
 	cd AmberTools/src
 	rm -r arpack blas lapack fftw-2.1.5 c9x-complex cifparse netcdf pnetcdf reduce ucpp-1.3 || die
 }
diff --git a/sci-chemistry/ambertools/ambertools-1.5.ebuild b/sci-chemistry/ambertools/ambertools-1.5.ebuild
index 776a56f5b..347c64b1a 100644
--- a/sci-chemistry/ambertools/ambertools-1.5.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.5.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils fortran-2
 
-DESCRIPTION="A suite of programs for carrying out complete molecular mechanics investigations"
+DESCRIPTION="A suite for carrying out complete molecular mechanics investigations"
 HOMEPAGE="http://ambermd.org/#AmberTools"
 SRC_URI="AmberTools-${PV}.tar.bz2"
 
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mpi openmp X"
+
 RESTRICT="fetch"
 
 RDEPEND="
@@ -38,21 +39,18 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build ${PN} with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
+	fortran-2_pkg_setup
+	if use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
 	fi
 	AMBERHOME="${S}"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bugfix_1-3.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch \
+		"${FILESDIR}/${P}-bugfix_1-3.patch" \
+		"${FILESDIR}/${P}-gentoo.patch"
 	cd AmberTools/src
 	rm -r arpack blas lapack fftw-2.1.5 c9x-complex cifparse netcdf pnetcdf reduce ucpp-1.3 || die
 }