Added fortran-2.eclass support

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

6 files changed, 52 insertions, 35 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index a80325488dcf..db6f1b7021fc 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.39 2011/05/28 12:20:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.40 2011/06/21 08:46:59 jlec Exp $
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> cns-1.1.ebuild,
+  cns-1.2.1.ebuild, cns-1.2.1-r5.ebuild, cns-1.2.1-r6.ebuild,
+  cns-1.3_p5.ebuild:
+  Added fortran-2.eclass support
 
   28 May 2011; Justin Lecher <jlec@gentoo.org> cns-1.2.1-r5.ebuild,
   cns-1.2.1-r6.ebuild, cns-1.3_p5.ebuild:
diff --git a/sci-chemistry/cns/cns-1.1.ebuild b/sci-chemistry/cns/cns-1.1.ebuild
index 1c324dc95c0b..a6a0efa85d24 100644
--- a/sci-chemistry/cns/cns-1.1.ebuild
+++ b/sci-chemistry/cns/cns-1.1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.8 2010/12/17 07:54:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.9 2011/06/21 08:46:59 jlec Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils fortran-2 toolchain-funcs
 
 MY_PN="${PN}_solve"
 MY_P="${MY_PN}_${PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="${MY_P}_basic_inputs.tar.gz
+SRC_URI="
+	${MY_P}_basic_inputs.tar.gz
 	${MY_P}_data.tar.gz
 	test? ( ${MY_P}_test.tar.gz )"
 
-LICENSE="cns"
 SLOT="0"
+LICENSE="cns"
 KEYWORDS="ppc x86"
 IUSE="test"
 
diff --git a/sci-chemistry/cns/cns-1.2.1-r5.ebuild b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
index a89a0fbb764a..afb0c1fa3399 100644
--- a/sci-chemistry/cns/cns-1.2.1-r5.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.9 2011/05/28 12:20:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.10 2011/06/21 08:46:59 jlec Exp $
 
 EAPI=3
 
-inherit eutils toolchain-funcs versionator flag-o-matic
+inherit eutils fortran-2 toolchain-funcs versionator flag-o-matic
 
 MY_PN="${PN}_solve"
 MY_PV="$(delete_version_separator 2)"
@@ -12,7 +12,8 @@ MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="${MY_P}_all-mp.tar.gz
+SRC_URI="
+	${MY_P}_all-mp.tar.gz
 	aria? ( aria2.3.1.tar.gz )"
 
 SLOT="0"
@@ -23,9 +24,12 @@ IUSE="aria openmp"
 RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
-RESTRICT="fetch"
+FORTRAN_NEED_OPENMP=1
+
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	elog "Fill out the form at http://cns.csb.yale.edu/cns_request/"
 	use aria && elog "and http://aria.pasteur.fr/"
@@ -46,9 +50,7 @@ get_fcomp() {
 }
 
 pkg_setup() {
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-	fi
+	fortran-2_pkg_setup
 	get_fcomp
 }
 
diff --git a/sci-chemistry/cns/cns-1.2.1-r6.ebuild b/sci-chemistry/cns/cns-1.2.1-r6.ebuild
index 772360e4f38f..3e75958930d4 100644
--- a/sci-chemistry/cns/cns-1.2.1-r6.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v 1.5 2011/05/28 12:20:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v 1.6 2011/06/21 08:46:59 jlec Exp $
 
 EAPI=3
 
-inherit eutils toolchain-funcs versionator flag-o-matic
+inherit eutils fortran-2 toolchain-funcs versionator flag-o-matic
 
 MY_PN="${PN}_solve"
 MY_PV="$(delete_version_separator 2)"
@@ -12,7 +12,8 @@ MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="${MY_P}_all-mp.tar.gz
+SRC_URI="
+	${MY_P}_all-mp.tar.gz
 	aria? ( aria2.3.1.tar.gz )"
 
 SLOT="0"
@@ -23,9 +24,12 @@ IUSE="aria openmp"
 RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
-RESTRICT="fetch"
+FORTRAN_NEED_OPENMP=1
+
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	elog "Fill out the form at http://cns.csb.yale.edu/cns_request/"
 	use aria && elog "and http://aria.pasteur.fr/"
@@ -46,9 +50,7 @@ get_fcomp() {
 }
 
 pkg_setup() {
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-	fi
+	fortran-2_pkg_setup
 	get_fcomp
 }
 
diff --git a/sci-chemistry/cns/cns-1.2.1.ebuild b/sci-chemistry/cns/cns-1.2.1.ebuild
index 67c4b23e91c3..5a6cd59037ac 100644
--- a/sci-chemistry/cns/cns-1.2.1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.11 2011/05/11 07:27:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.12 2011/06/21 08:46:59 jlec Exp $
 
-inherit eutils toolchain-funcs versionator flag-o-matic
+inherit eutils fortran-2 toolchain-funcs versionator flag-o-matic
 
 MY_PN="${PN}_solve"
 MY_PV="$(delete_version_separator 2)"
@@ -10,17 +10,24 @@ MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="!openmp? ( ${MY_P}_all.tar.gz )
+SRC_URI="
+	!openmp? ( ${MY_P}_all.tar.gz )
 	openmp? ( ${MY_P}_all-mp.tar.gz )"
-RESTRICT="fetch"
-LICENSE="cns"
+
 SLOT="0"
+LICENSE="cns"
 KEYWORDS="amd64 ~ppc ~x86"
 IUSE="openmp"
+
 RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
+
+FORTRAN_NEED_OPENMP=1
+
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	elog "Fill out the form at http://cns.csb.yale.edu/cns_request/"
 	elog "and place these files:"
@@ -40,9 +47,7 @@ get_fcomp() {
 }
 
 pkg_setup() {
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-	fi
+	fortran-2_pkg_setup
 	get_fcomp
 }
 
diff --git a/sci-chemistry/cns/cns-1.3_p5.ebuild b/sci-chemistry/cns/cns-1.3_p5.ebuild
index a76048abf63d..08e38c426f77 100644
--- a/sci-chemistry/cns/cns-1.3_p5.ebuild
+++ b/sci-chemistry/cns/cns-1.3_p5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.3 2011/05/28 12:20:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.4 2011/06/21 08:46:59 jlec Exp $
 
 EAPI=3
 
-inherit eutils toolchain-funcs versionator flag-o-matic
+inherit eutils fortran-2 toolchain-funcs versionator flag-o-matic
 
 MY_PN="${PN}_solve"
 MY_PV="$(delete_version_separator 2)"
@@ -12,7 +12,8 @@ MY_P="${MY_PN}_${MY_PV}"
 
 DESCRIPTION="Crystallography and NMR System"
 HOMEPAGE="http://cns.csb.yale.edu/"
-SRC_URI="${MY_P/p5}_all.tar.gz
+SRC_URI="
+	${MY_P/p5}_all.tar.gz
 	aria? ( aria2.3.1.tar.gz )"
 
 SLOT="0"
@@ -23,9 +24,12 @@ IUSE="aria openmp"
 RDEPEND="app-shells/tcsh"
 DEPEND="${RDEPEND}"
 
-RESTRICT="fetch"
+FORTRAN_NEED_OPENMP=1
+
 S="${WORKDIR}/${MY_P/p5}"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	elog "Fill out the form at http://cns.csb.yale.edu/cns_request/"
 	use aria && elog "and http://aria.pasteur.fr/"
@@ -46,9 +50,7 @@ get_fcomp() {
 }
 
 pkg_setup() {
-	if [[ $(tc-getFC) =~ gfortran ]]; then
-		tc-has-openmp || die "Please ensure your compiler has openmp support"
-	fi
+	fortran-2_pkg_setup
 	get_fcomp
 }