Fix for fortran detection, thanks alexxy noting this

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

4 files changed, 55 insertions, 29 deletions

diff --git a/sci-chemistry/gamess/ChangeLog b/sci-chemistry/gamess/ChangeLog
index 5ffeb7589107..16488092f4f8 100644
--- a/sci-chemistry/gamess/ChangeLog
+++ b/sci-chemistry/gamess/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gamess
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.46 2010/12/16 15:31:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.47 2010/12/20 19:37:00 jlec Exp $
+
+  20 Dec 2010; Justin Lecher <jlec@gentoo.org> gamess-20090112.1-r1.ebuild,
+  gamess-20101001.1.ebuild:
+  Fix for fortran detection, thanks alexxy noting this
 
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> gamess-20090112.1-r1.ebuild,
   gamess-20101001.1.ebuild:
diff --git a/sci-chemistry/gamess/Manifest b/sci-chemistry/gamess/Manifest
index f1756cf34c49..2d97cbfa3661 100644
--- a/sci-chemistry/gamess/Manifest
+++ b/sci-chemistry/gamess/Manifest
@@ -7,14 +7,14 @@ AUX gamess-qmmm-tinker-fix-idate.patch 611 RMD160 cdcf164d80f36db3a631659d85b7e0
 DIST gamess-20090112.1.tar.gz 10823509 RMD160 409aafba9136a441c1524fe30eb1fccdff1f9883 SHA1 4af8dd470700649d32317d8ab57814b010a4403d SHA256 9f7763933479ba8aa730c392af25b8a271152115a0392707786b45871b52f6e0
 DIST gamess-20101001.1.tar.gz 16029694 RMD160 8730ac02b1e9f6a9e6c90caf507fc8b65a7bc79f SHA1 3a38b8d96db4195755ad3aabc12d018288a37ce4 SHA256 346ce85cb9580fce770c28a2ba15c43a7258f4af4fbeda1e5ce5330e459e49f1
 DIST tinker.tar.Z 1902051 RMD160 b467fe3231d469309c1d48d29ee15975a3f305c0 SHA1 e1e9fde440de1854a8b49b6ae2259df27e871651 SHA256 7c52454ade7dd81d1b70a7e7722eda3672c644a3ba67ab444824a0212b4a7a8c
-EBUILD gamess-20090112.1-r1.ebuild 7662 RMD160 8cdc5f78a0537b43534b254b8b09dea89707918d SHA1 1ce9d80fabc90b18541b3aabc606a7315da16bfd SHA256 56f666ff4a935d29cbc8403d0e8b5e14aa793b1e19229241b98eaeaf76811fa8
-EBUILD gamess-20101001.1.ebuild 9887 RMD160 c545109038e93ac86591773a0e93e2aac1fe90d5 SHA1 8123af722d7adb8b68cf27bc53561fe1dd09e1e8 SHA256 2f13849a5c58aec8536ec65d561bd4a50eb84126f96b23b909356a40cd7fbf9d
-MISC ChangeLog 9933 RMD160 f628e79cc45d0b73d9ba06279e3688404594ae97 SHA1 fb48ed31e642cff675d99f45ec336297f2d32f12 SHA256 f5c8214b5f5feb39c712ce23efa7a2e37ca51d712b610cffeb90b1dc833ddd8e
+EBUILD gamess-20090112.1-r1.ebuild 7767 RMD160 4c5864e2140f51e58a048616baf872a43d4dd033 SHA1 f8b5f645e79339f3c159e93899ebad60031c4d18 SHA256 36d8d88cb1f99d0a0dbba357c94d7424004210eae2c7fbb4a73f3bd308c79fe2
+EBUILD gamess-20101001.1.ebuild 10002 RMD160 00f8d71f867c3cf454cda93fc26ea760e3b1c363 SHA1 64c0bd091eae34901f7ec7747306b039c029e27b SHA256 feb30d3bb323926bd2dee980349693b83c7b40128ccb74c12913800ab210d14c
+MISC ChangeLog 10093 RMD160 b84929af5fdc40f6021604bd57ca481888863b00 SHA1 10cf8f68ad22859d5b61d3c72cca2b91c4adb8bd SHA256 162c79ab0937d041a04bf8d0e92667ebda4fe9bd927263ef428c87d4cd34c8b9
 MISC metadata.xml 495 RMD160 8d8009951af66115eb17c263a247d5ce8fe5400a SHA1 2e5459a0ee549635205ba783b278ab7feaabbcff SHA256 f8676d187607d38dcc1316bf051e6b5464f868d5a65d616f00af3a35f9a20f6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0OcYEACgkQgAnW8HDreRa0JwCfVVOVR0FKpGQ95ldiGIIyLNb9
-154AoI07+V8eRiDhNPThY88TsZkKD6gd
-=dgUF
+iEYEARECAAYFAk0PsGoACgkQgAnW8HDreRaG2wCgp5R/0H9bTRrwYyzsIM8XYyLw
+Al4AoK+mQYpaTl/naicuKxMZaBVJk44n
+=z1EA
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild b/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild
index 2ec28f655ca0..5173ebdd5015 100644
--- a/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild
+++ b/sci-chemistry/gamess/gamess-20090112.1-r1.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/gamess/gamess-20090112.1-r1.ebuild,v 1.10 2010/12/19 20:56:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild,v 1.11 2010/12/20 19:37:00 jlec Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -43,10 +43,21 @@ pkg_nofetch() {
 	echo
 }
 
-pkg_setup() {
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
 
+pkg_setup() {
+	get_fcomp
 	# currently amd64 is only supported with gfortran
-	if [[ "${ARCH}" == "amd64" ]] && [[ "$(tc-getFC)" != *gfortran* ]];
+	if [[ "${ARCH}" == "amd64" ]] && [[ ${FCOMP} != *gfortran* ]];
 		then die "You will need gfortran to compile gamess on amd64"
 	fi
 
@@ -79,7 +90,7 @@ src_unpack() {
 
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
-	if use hardened && [[ "$(tc-getFC)" =~ g77 ]]; then
+	if use hardened && [[ ${FCOMP} == g77 ]]; then
 		FFLAGS="${FFLAGS} -fno-stack-protector-all"
 	fi
 
@@ -115,29 +126,29 @@ src_unpack() {
 	# insert proper FFLAGS into GAMESS' comp makefile
 	# in case we're using ifc let's strip all the gcc
 	# specific stuff
-	if [[ "$(tc-getFC)" == "ifort" ]]; then
+	if [[ ${FCOMP} == "ifort" ]]; then
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS} -quiet'/" \
-			-e "s/gentoo-g77/$(tc-getFC)/" \
+			-e "s/gentoo-g77/${FCOMP}/" \
 			-i comp || die "Failed setting up comp script"
 	elif ! use x86; then
 		sed -e "s/-malign-double //" \
 			-e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS}'/" \
-			-e "s/gentoo-g77/$(tc-getFC)/" \
+			-e "s/gentoo-g77/${FCOMP}/" \
 			-i comp || die "Failed setting up comp script"
 	else
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS}'/" \
-			-e "s/gentoo-g77/$(tc-getFC)/" \
+			-e "s/gentoo-g77/${FCOMP}/" \
 			-i comp || die "Failed setting up comp script"
 	fi
 
 	# fix up GAMESS' linker script;
-	sed -e "s/gentoo-g77/$(tc-getFC)/" \
+	sed -e "s/gentoo-g77/${FCOMP}/" \
 		-e "s/gentoo-LDOPTS=' '/LDOPTS='${LDFLAGS}'/" \
 		-i lked || die "Failed setting up lked script"
 
 	# fix up GAMESS' ddi TCP/IP socket build
 	sed -e "s/gentoo-CC = 'gcc'/CC = '$(tc-getCC)'/" \
-		-e "s/gentoo-g77/$(tc-getFC)/" \
+		-e "s/gentoo-g77/${FCOMP}/" \
 		-i ddi/compddi || die "Failed setting up compddi script"
 
 	# fix up the checker scripts for gamess tests
@@ -154,7 +165,7 @@ src_compile() {
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
+	if [[ ${FCOMP} == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS actvte.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -173,7 +184,7 @@ src_compile() {
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
+	if [[ ${FCOMP} == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS ${PN}.00.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -233,7 +244,7 @@ pkg_postinst() {
 	einfo "validate the tests."
 	einfo "Please consult TEST.DOC and the other docs!"
 
-	if [[ "$(tc-getFC)" == "ifort" ]]; then
+	if [[ ${FCOMP} == "ifort" ]]; then
 		echo
 		ewarn "IMPORTANT NOTE: We STRONGLY recommend to stay away"
 		ewarn "from ifc-9.0 for now and use the ifc-8.1 series of"
diff --git a/sci-chemistry/gamess/gamess-20101001.1.ebuild b/sci-chemistry/gamess/gamess-20101001.1.ebuild
index 07dc01f1cc95..a4646bbc5d9a 100644
--- a/sci-chemistry/gamess/gamess-20101001.1.ebuild
+++ b/sci-chemistry/gamess/gamess-20101001.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/gamess/gamess-20101001.1.ebuild,v 1.5 2010/12/19 20:56:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild,v 1.6 2010/12/20 19:37:00 jlec Exp $
 
 EAPI="3"
 
@@ -52,10 +52,21 @@ pkg_nofetch() {
 	echo
 }
 
-pkg_setup() {
+get_fcomp() {
+	case $(tc-getFC) in
+		*gfortran* )
+			FCOMP="gfortran" ;;
+		ifort )
+			FCOMP="ifc" ;;
+		* )
+			FCOMP=$(tc-getFC) ;;
+	esac
+}
 
+pkg_setup() {
+	get_fcomp
 	# currently amd64 is only supported with gfortran
-	if [[ "${ARCH}" == "amd64" ]] && [[ "$(tc-getFC)" != *gfortran* ]];
+	if [[ "${ARCH}" == "amd64" ]] && [[ ${FCOMP} != *gfortran* ]];
 		then die "You will need gfortran to compile gamess on amd64"
 	fi
 
@@ -105,7 +116,7 @@ src_prepare() {
 
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
-	if use hardened && [[ "$(tc-getFC)" =~ g77 ]]; then
+	if use hardened && [[ ${FCOMP} == g77 ]]; then
 		FFLAGS="${FFLAGS} -fno-stack-protector-all"
 	fi
 
@@ -178,7 +189,7 @@ src_prepare() {
 	# insert proper FFLAGS into GAMESS' comp makefile
 	# in case we're using ifc let's strip all the gcc
 	# specific stuff
-	if [[ "$(tc-getFC)" == "ifort" ]]; then
+	if [[ ${FCOMP} == "ifort" ]]; then
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS} -quiet'/" \
 			-i comp || die "Failed setting up comp script"
 	elif ! use x86; then
@@ -212,12 +223,12 @@ src_prepare() {
 src_compile() {
 	# build actvte
 	cd "${S}"/tools
-	"$(tc-getFC)" -o actvte.x actvte.f || \
+	${FCOMP} -o actvte.x actvte.f || \
 		die "Failed to compile actvte.x"
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
+	if [[ ${FCOMP} == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS actvte.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -236,7 +247,7 @@ src_compile() {
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
+	if [[ ${FCOMP} == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS ${PN}.00.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -300,7 +311,7 @@ pkg_postinst() {
 	einfo "validate the tests."
 	einfo "Please consult TEST.DOC and the other docs!"
 
-	if [[ "$(tc-getFC)" == "ifort" ]]; then
+	if [[ ${FCOMP} == "ifort" ]]; then
 		echo
 		ewarn "IMPORTANT NOTE: We STRONGLY recommend to stay away"
 		ewarn "from ifc-9.0 for now and use the ifc-8.1 series of"