public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/gamess: gamess-20090112.1-r1.ebuild gamess-20101001.1.ebuild ChangeLog
@ 2010-12-16 15:31 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-12-16 15:31 UTC (permalink / raw
  To: gentoo-commits

jlec        10/12/16 15:31:51

  Modified:             gamess-20090112.1-r1.ebuild
                        gamess-20101001.1.ebuild ChangeLog
  Log:
  Removal of fortran.eclass, #348851
  
  (Portage version: 2.2.0_alpha8/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  sci-chemistry/gamess/gamess-20090112.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?r1=1.8&r2=1.9

Index: gamess-20090112.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gamess-20090112.1-r1.ebuild	24 May 2010 12:42:17 -0000	1.8
+++ gamess-20090112.1-r1.ebuild	16 Dec 2010 15:31:51 -0000	1.9
@@ -1,22 +1,20 @@
 # 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.8 2010/05/24 12:42:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild,v 1.9 2010/12/16 15:31:51 jlec Exp $
 
-inherit eutils toolchain-funcs fortran flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A powerful quantum chemistry package"
-LICENSE="gamess"
 HOMEPAGE="http://www.msg.chem.iastate.edu/GAMESS/GAMESS.html"
 SRC_URI="
 		${P}.tar.gz
 		qmmm-tinker? ( tinker.tar.Z )"
 
+LICENSE="gamess"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="hardened qmmm-tinker"
 
-RESTRICT="fetch"
-
 DEPEND="app-shells/tcsh
 	hardened? ( sys-apps/paxctl )
 	virtual/blas"
@@ -24,11 +22,12 @@
 RDEPEND="${DEPEND}
 	net-misc/openssh"
 
+RESTRICT="fetch"
+
 S="${WORKDIR}/${PN}"
 
 GAMESS_DOWNLOAD="http://www.msg.ameslab.gov/GAMESS/License_Agreement.html"
 GAMESS_VERSION="12 JAN 2009 (R1)"
-FORTRAN="ifc g77 gfortran"
 
 pkg_nofetch() {
 	echo
@@ -45,10 +44,9 @@
 }
 
 pkg_setup() {
-	fortran_pkg_setup
 
 	# currently amd64 is only supported with gfortran
-	if [[ "${ARCH}" == "amd64" ]] && [[ "${FORTRANC}" != "gfortran" ]];
+	if [[ "${ARCH}" == "amd64" ]] && [[ "$(tc-getFC)" != "gfortran" ]];
 		then die "You will need gfortran to compile gamess on amd64"
 	fi
 
@@ -81,7 +79,7 @@
 
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
-	if use hardened && [[ "${FORTRANC}" = "g77" ]]; then
+	if use hardened && [[ "$(tc-getFC)" = "g77" ]]; then
 		FFLAGS="${FFLAGS} -fno-stack-protector-all"
 	fi
 
@@ -117,29 +115,29 @@
 	# insert proper FFLAGS into GAMESS' comp makefile
 	# in case we're using ifc let's strip all the gcc
 	# specific stuff
-	if [[ "${FORTRANC}" == "ifc" ]]; then
+	if [[ "$(tc-getFC)" == "ifort" ]]; then
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS} -quiet'/" \
-			-e "s/gentoo-g77/${FORTRANC}/" \
+			-e "s/gentoo-g77/$(tc-getFC)/" \
 			-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/${FORTRANC}/" \
+			-e "s/gentoo-g77/$(tc-getFC)/" \
 			-i comp || die "Failed setting up comp script"
 	else
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS}'/" \
-			-e "s/gentoo-g77/${FORTRANC}/" \
+			-e "s/gentoo-g77/$(tc-getFC)/" \
 			-i comp || die "Failed setting up comp script"
 	fi
 
 	# fix up GAMESS' linker script;
-	sed -e "s/gentoo-g77/${FORTRANC}/" \
+	sed -e "s/gentoo-g77/$(tc-getFC)/" \
 		-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/${FORTRANC}/" \
+		-e "s/gentoo-g77/$(tc-getFC)/" \
 		-i ddi/compddi || die "Failed setting up compddi script"
 
 	# fix up the checker scripts for gamess tests
@@ -151,12 +149,12 @@
 src_compile() {
 	# build actvte
 	cd "${S}"/tools
-	"${FORTRANC}" -o actvte.x actvte.f || \
+	"$(tc-getFC)" -o actvte.x actvte.f || \
 		die "Failed to compile actvte.x"
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
+	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS actvte.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -175,7 +173,7 @@
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
+	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS ${PN}.00.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -235,7 +233,7 @@
 	einfo "validate the tests."
 	einfo "Please consult TEST.DOC and the other docs!"
 
-	if [[ "${FORTRANC}" == "ifc" ]]; then
+	if [[ "$(tc-getFC)" == "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"



1.4                  sci-chemistry/gamess/gamess-20101001.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?r1=1.3&r2=1.4

Index: gamess-20101001.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gamess-20101001.1.ebuild	8 Dec 2010 18:19:09 -0000	1.3
+++ gamess-20101001.1.ebuild	16 Dec 2010 15:31:51 -0000	1.4
@@ -1,10 +1,10 @@
 # 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.3 2010/12/08 18:19:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild,v 1.4 2010/12/16 15:31:51 jlec Exp $
 
 EAPI="3"
 
-inherit eutils toolchain-funcs fortran flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A powerful quantum chemistry package"
 LICENSE="gamess"
@@ -22,8 +22,6 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="hardened mpi neo qmmm-tinker"
 
-RESTRICT="fetch"
-
 CDEPEND="app-shells/tcsh
 	hardened? ( sys-apps/paxctl )
 	mpi? ( virtual/mpi )
@@ -35,9 +33,10 @@
 
 S="${WORKDIR}/${PN}"
 
+RESTRICT="fetch"
+
 GAMESS_DOWNLOAD="http://www.msg.ameslab.gov/GAMESS/License_Agreement.html"
 GAMESS_VERSION="1 OCT 2010 (R1)"
-FORTRAN="ifc g77 gfortran"
 
 pkg_nofetch() {
 	echo
@@ -54,10 +53,9 @@
 }
 
 pkg_setup() {
-	fortran_pkg_setup
 
 	# currently amd64 is only supported with gfortran
-	if [[ "${ARCH}" == "amd64" ]] && [[ "${FORTRANC}" != "gfortran" ]];
+	if [[ "${ARCH}" == "amd64" ]] && [[ "$(tc-getFC)" != "gfortran" ]];
 		then die "You will need gfortran to compile gamess on amd64"
 	fi
 
@@ -107,7 +105,7 @@
 
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
-	if use hardened && [[ "${FORTRANC}" = "g77" ]]; then
+	if use hardened && [[ "$(tc-getFC)" = "g77" ]]; then
 		FFLAGS="${FFLAGS} -fno-stack-protector-all"
 	fi
 
@@ -180,7 +178,7 @@
 	# insert proper FFLAGS into GAMESS' comp makefile
 	# in case we're using ifc let's strip all the gcc
 	# specific stuff
-	if [[ "${FORTRANC}" == "ifc" ]]; then
+	if [[ "$(tc-getFC)" == "ifort" ]]; then
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS} -quiet'/" \
 			-i comp || die "Failed setting up comp script"
 	elif ! use x86; then
@@ -214,12 +212,12 @@
 src_compile() {
 	# build actvte
 	cd "${S}"/tools
-	"${FORTRANC}" -o actvte.x actvte.f || \
+	"$(tc-getFC)" -o actvte.x actvte.f || \
 		die "Failed to compile actvte.x"
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
+	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS actvte.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -238,7 +236,7 @@
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
+	if [[ "$(tc-getFC)" == "ifort" ]] && use hardened; then
 		/sbin/paxctl -PemRxS ${PN}.00.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -302,7 +300,7 @@
 	einfo "validate the tests."
 	einfo "Please consult TEST.DOC and the other docs!"
 
-	if [[ "${FORTRANC}" == "ifc" ]]; then
+	if [[ "$(tc-getFC)" == "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"



1.46                 sci-chemistry/gamess/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	8 Dec 2010 18:19:10 -0000	1.45
+++ ChangeLog	16 Dec 2010 15:31:51 -0000	1.46
@@ -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.45 2010/12/08 18:19:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.46 2010/12/16 15:31:51 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> gamess-20090112.1-r1.ebuild,
+  gamess-20101001.1.ebuild:
+  Removal of fortran.eclass, #348851
 
   08 Dec 2010; Alexey Shvetsov <alexxy@gentoo.org> gamess-20101001.1.ebuild:
   Fix neo code






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/gamess: gamess-20090112.1-r1.ebuild gamess-20101001.1.ebuild ChangeLog
@ 2010-12-20 19:37 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-12-20 19:37 UTC (permalink / raw
  To: gentoo-commits

jlec        10/12/20 19:37:01

  Modified:             gamess-20090112.1-r1.ebuild
                        gamess-20101001.1.ebuild ChangeLog
  Log:
  Fix for fortran detection, thanks alexxy noting this
  
  (Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 sci-chemistry/gamess/gamess-20090112.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild?r1=1.10&r2=1.11

Index: gamess-20090112.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20090112.1-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gamess-20090112.1-r1.ebuild	19 Dec 2010 20:56:27 -0000	1.10
+++ gamess-20090112.1-r1.ebuild	20 Dec 2010 19:37:00 -0000	1.11
@@ -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 @@
 	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 @@
 
 	# 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 @@
 	# 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 @@
 
 	# 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 @@
 
 	# 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 @@
 	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"



1.6                  sci-chemistry/gamess/gamess-20101001.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild?r1=1.5&r2=1.6

Index: gamess-20101001.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20101001.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gamess-20101001.1.ebuild	19 Dec 2010 20:56:27 -0000	1.5
+++ gamess-20101001.1.ebuild	20 Dec 2010 19:37:00 -0000	1.6
@@ -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 @@
 	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 @@
 
 	# 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 @@
 	# 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_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 @@
 
 	# 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 @@
 	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"



1.47                 sci-chemistry/gamess/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gamess/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog	16 Dec 2010 15:31:51 -0000	1.46
+++ ChangeLog	20 Dec 2010 19:37:00 -0000	1.47
@@ -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:






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-12-20 19:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-16 15:31 [gentoo-commits] gentoo-x86 commit in sci-chemistry/gamess: gamess-20090112.1-r1.ebuild gamess-20101001.1.ebuild ChangeLog Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2010-12-20 19:37 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox