Fix for fortran.eclass removal

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

5 files changed, 67 insertions, 17 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 33e1904c41ce..7fc61c077cf5 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.31 2010/12/16 13:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.32 2010/12/17 07:54:48 jlec Exp $
+
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org> cns-1.1.ebuild,
+  cns-1.2.1.ebuild, cns-1.2.1-r5.ebuild, cns-1.3_p3.ebuild:
+  Fix for fortran.eclass removal
 
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> cns-1.1.ebuild,
   cns-1.2.1.ebuild, cns-1.2.1-r5.ebuild, cns-1.3_p3.ebuild:
diff --git a/sci-chemistry/cns/cns-1.1.ebuild b/sci-chemistry/cns/cns-1.1.ebuild
index 3625a77956f7..1c324dc95c0b 100644
--- a/sci-chemistry/cns/cns-1.1.ebuild
+++ b/sci-chemistry/cns/cns-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7 2010/12/16 13:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.8 2010/12/17 07:54:48 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -32,7 +32,18 @@ pkg_nofetch() {
 	einfo "in ${DISTDIR}."
 }
 
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
 src_unpack() {
+	get_fcomp
 	unpack ${A}
 
 	# The length of time must be at least 10, not 9
@@ -49,7 +60,7 @@ src_unpack() {
 
 src_compile() {
 	local GLOBALS
-	if [[ $(tc-getFC) = g77 ]]; then
+	if [[ $(tc-getFC) =~ g77 ]]; then
 		GLOBALS="-fno-globals"
 	fi
 
diff --git a/sci-chemistry/cns/cns-1.2.1-r5.ebuild b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
index 64f14807747c..82fcfe7583d0 100644
--- a/sci-chemistry/cns/cns-1.2.1-r5.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4 2010/12/16 13:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.5 2010/12/17 07:54:48 jlec Exp $
 
 EAPI="3"
 
@@ -34,8 +34,20 @@ pkg_nofetch() {
 	elog "in ${DISTDIR}."
 }
 
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
+
 pkg_setup() {
-	tc-has-openmp
+	tc-has-openmp || die "Please ensure your compiler has openmp support"
+	get_fcomp
 }
 
 src_prepare() {
@@ -53,7 +65,7 @@ src_prepare() {
 	fi
 
 	# the code uses Intel-compiler-specific directives
-	if [[ $(tc-getFC) == gfortran ]]; then
+	if [[ $(tc-getFC) =~ gfortran ]]; then
 		epatch "${FILESDIR}"/${PV}-allow-gcc-openmp.patch
 		use openmp && \
 			OMPLIB="-lgomp" && append-flags -fopenmp
@@ -93,14 +105,14 @@ src_prepare() {
 src_compile() {
 	local GLOBALS
 	local MALIGN
-	if [[ $(tc-getFC) = g77 ]]; then
+	if [[ $(tc-getFC) =~ g77 ]]; then
 		GLOBALS="-fno-globals"
 		MALIGN='\$(CNS_MALIGN_I86)'
 	fi
 
 	# Set up the compiler to use
 	pushd instlib/machine/unsupported/g77-unix 2>/dev/null
-	ln -s Makefile.header Makefile.header.$(tc-getFC) || die
+	ln -s Makefile.header Makefile.header.${FCOMP} || die
 	popd 2>/dev/null
 
 	# make install really means build, since it's expected to be used in-place
@@ -117,7 +129,6 @@ src_compile() {
 		compiler="${COMP}" \
 		install \
 		|| die "emake failed"
-
 }
 
 src_test() {
diff --git a/sci-chemistry/cns/cns-1.2.1.ebuild b/sci-chemistry/cns/cns-1.2.1.ebuild
index cc78fb1b61e6..1c87f343ba5f 100644
--- a/sci-chemistry/cns/cns-1.2.1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.8 2010/12/16 13:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.9 2010/12/17 07:54:48 jlec Exp $
 
 inherit eutils toolchain-funcs versionator flag-o-matic
 
@@ -28,8 +28,20 @@ pkg_nofetch() {
 	elog "in ${DISTDIR}."
 }
 
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
+
 pkg_setup() {
-	tc-has-openmp
+	tc-has-openmp || die "Please ensure your compiler has openmp support"
+	get_fcomp
 }
 
 src_unpack() {
@@ -61,14 +73,14 @@ src_unpack() {
 src_compile() {
 	local GLOBALS
 	local MALIGN=
-	if [[ $(tc-getFC) = g77 ]]; then
+	if [[ $(tc-getFC) =~ g77 ]]; then
 		GLOBALS="-fno-globals"
 		MALIGN='\$(CNS_MALIGN_I86)'
 	fi
 
 	# Set up the compiler to use
 	pushd instlib/machine/unsupported/g77-unix 2>/dev/null
-	ln -s Makefile.header Makefile.header.$(tc-getFC) || die
+	ln -s Makefile.header Makefile.header.${FCOMP} || die
 	popd 2>/dev/null
 
 	# make install really means build, since it's expected to be used in-place
diff --git a/sci-chemistry/cns/cns-1.3_p3.ebuild b/sci-chemistry/cns/cns-1.3_p3.ebuild
index d511d92da5e7..37a0c8962abb 100644
--- a/sci-chemistry/cns/cns-1.3_p3.ebuild
+++ b/sci-chemistry/cns/cns-1.3_p3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p3.ebuild,v 1.2 2010/12/16 13:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p3.ebuild,v 1.3 2010/12/17 07:54:48 jlec Exp $
 
 EAPI="3"
 
@@ -34,8 +34,20 @@ pkg_nofetch() {
 	elog "in ${DISTDIR}."
 }
 
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
+
 pkg_setup() {
-	tc-has-openmp
+	tc-has-openmp || die "Please ensure your compiler has openmp support"
+	get_fcomp
 }
 
 src_prepare() {
@@ -54,7 +66,7 @@ src_prepare() {
 	fi
 
 	# the code uses Intel-compiler-specific directives
-	if [[ $(tc-getFC) == gfortran ]]; then
+	if [[ $(tc-getFC) =~ gfortran ]]; then
 		use openmp && \
 			OMPLIB="-lgomp" && append-flags -fopenmp
 		COMP="gfortran"
@@ -103,7 +115,7 @@ src_compile() {
 
 	# Set up the compiler to use
 	pushd instlib/machine/unsupported/g77-unix 2>/dev/null
-	ln -s Makefile.header Makefile.header.$(tc-getFC) || die
+	ln -s Makefile.header Makefile.header.${FCOMP} || die
 	popd 2>/dev/null
 
 	# make install really means build, since it's expected to be used in-place