Made ebuild ready to compile and run properly using gfortran.

(Portage version: 2.1_pre4-r1)

4 files changed, 82 insertions, 15 deletions

diff --git a/sci-chemistry/gamess/ChangeLog b/sci-chemistry/gamess/ChangeLog
index 14fdcdc174c7..c182a202bc9d 100644
--- a/sci-chemistry/gamess/ChangeLog
+++ b/sci-chemistry/gamess/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gamess
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.7 2006/01/23 02:39:49 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.8 2006/02/08 21:54:55 markusle Exp $
+
+  08 Feb 2006; Markus Dittrich <markusle@gentoo.org>
+  gamess-05272005.5.ebuild:
+  Made ebuild ready to compile and run properly using gfortran.
 
   23 Jan 2006; Markus Dittrich <markusle@gentoo.org>
   files/digest-gamess-05272005.5, Manifest:
diff --git a/sci-chemistry/gamess/Manifest b/sci-chemistry/gamess/Manifest
index 57ac816edffd..0a1604cc614a 100644
--- a/sci-chemistry/gamess/Manifest
+++ b/sci-chemistry/gamess/Manifest
@@ -1,20 +1,60 @@
 MD5 b5db8b95292e59944dcd7887588f0ba2 ChangeLog 2041
+RMD160 1a2d6c3f16afd9e0ff8e55e7507703366d00296b ChangeLog 2041
+SHA256 564e573770a9fe89550586e95d701cc4095bc8d5db8e76314ead2fd09be0447d ChangeLog 2041
 MD5 5b5d5d5d530d675c1f8fea3e2bda27c6 files/comp-gentoo.1.patch 1376
+RMD160 6f78c033069b1d848d3ee501b9282fb5f8610d2b files/comp-gentoo.1.patch 1376
+SHA256 0b067b1ab0a82df79576630b0cf0f418b78e06040004a095dc11a282941a5fd9 files/comp-gentoo.1.patch 1376
 MD5 cc629344d268783ea8be555bd06249af files/comp-gentoo.patch 1276
+RMD160 2c7017ceb0138dd192a1a72cf90dcff68f9a69b8 files/comp-gentoo.patch 1276
+SHA256 eb2cb647d2e48ed173cbebc24582d33743833a9345b1472ec2f6b6d28b592a0f files/comp-gentoo.patch 1276
 MD5 88aa0ef3a19289c609a5167e2176bbf6 files/compall-gentoo.patch 445
+RMD160 0a50c20d0aade7a0bb39f973dd76792a6a01caa2 files/compall-gentoo.patch 445
+SHA256 793e9b7047d1dfd5839a1d6b980c5bcc79477dd52bd1ca1034d1ef2949428beb files/compall-gentoo.patch 445
 MD5 e980cc327bd2de746b91a395f1af3e0f files/compddi-gentoo.patch 975
+RMD160 47134cdc3c2cdbd589d27d63f6af015490faf711 files/compddi-gentoo.patch 975
+SHA256 03afb475f2b6a164e4b6bac1192d5a71eef1586435a1e684e5c19ada81354e54 files/compddi-gentoo.patch 975
 MD5 7635651c5b13ead41c16d56094238fcb files/ddi-use-ssh-gentoo.patch 518
+RMD160 af1da3efe8341e437e4c98cd0aff7a892dce7241 files/ddi-use-ssh-gentoo.patch 518
+SHA256 e283de0eab10c2e3aecc10f6b6a760b4b7c9aec71c07c728929ca82a83459ccd files/ddi-use-ssh-gentoo.patch 518
 MD5 51d32e48137f8f59ff14cd870cbc70b2 files/digest-gamess-05272005.3 70
+RMD160 c60b8ba044942f3d67ae9bdbad2258945bb080b5 files/digest-gamess-05272005.3 70
+SHA256 c0bae935e385dda2ba3eced5dba876825f1e0fba411800ea25880b4358d78e73 files/digest-gamess-05272005.3 70
 MD5 51d32e48137f8f59ff14cd870cbc70b2 files/digest-gamess-05272005.3-r1 70
+RMD160 c60b8ba044942f3d67ae9bdbad2258945bb080b5 files/digest-gamess-05272005.3-r1 70
+SHA256 c0bae935e385dda2ba3eced5dba876825f1e0fba411800ea25880b4358d78e73 files/digest-gamess-05272005.3-r1 70
 MD5 51d32e48137f8f59ff14cd870cbc70b2 files/digest-gamess-05272005.3-r2 70
-MD5 814c3315966a1277cdc407629afde8c5 files/digest-gamess-05272005.5 70
+RMD160 c60b8ba044942f3d67ae9bdbad2258945bb080b5 files/digest-gamess-05272005.3-r2 70
+SHA256 c0bae935e385dda2ba3eced5dba876825f1e0fba411800ea25880b4358d78e73 files/digest-gamess-05272005.3-r2 70
+MD5 051b8ba59df924443b9fc3199a5f3c31 files/digest-gamess-05272005.5 256
+RMD160 eeeb8614a13db1b299771e76e0a523fa814ae513 files/digest-gamess-05272005.5 256
+SHA256 693e3546980d917b1fb02c9c17519d176c1df8ede1381e475272574b8b2835b1 files/digest-gamess-05272005.5 256
 MD5 d2f6837d02ac960e7bed4addf9632eec files/lked-gentoo.patch 783
+RMD160 0dbf965aabc02e82bc818f2d0e55f76900ea2641 files/lked-gentoo.patch 783
+SHA256 7d2f513c6413fcd25a0e8566272db72e48e08c75edcf34f4e12fc0a98fddf71d files/lked-gentoo.patch 783
 MD5 e4d9a65b9c8e365bf2e4f2de8a5e1e55 files/runall-gentoo.1.patch 483
+RMD160 12199477c3fa86a8f2132538f45c8cf786b863e6 files/runall-gentoo.1.patch 483
+SHA256 40226df377cea8e8f43e364efed797ec22c82edf0fa92da51338315d583ea4e2 files/runall-gentoo.1.patch 483
 MD5 bfc4049f6e2546889b161c6c9b3be72f files/runall-gentoo.patch 688
+RMD160 b7c085cfa66ea34b0781ce3512b838f573d2bb66 files/runall-gentoo.patch 688
+SHA256 f6b469a3965dc6c060c1473e7ddc519feff66e5da372373e4bbdc4a03c2d7623 files/runall-gentoo.patch 688
 MD5 549e3fee1dda6f731af6c5da281e5fd7 files/rungms-gentoo.1.patch 1804
+RMD160 d800937c118bac2dc93390a666db548d26f4273f files/rungms-gentoo.1.patch 1804
+SHA256 0defb144336b97b5cf816a80e509133b74f55c75a909884f25296663f377a486 files/rungms-gentoo.1.patch 1804
 MD5 b071fb871be1c8b9bc57bcd160dc6fd9 files/rungms-gentoo.patch 1801
+RMD160 f31d8baa48e5dbde2018fb4e0ae9c994574a43c6 files/rungms-gentoo.patch 1801
+SHA256 07a98d4218d2b264f94325c43173d3c2f64a51a80282f6694892999cbe4fc334 files/rungms-gentoo.patch 1801
 MD5 2e42d76c41b4338282fe7e1b5cfd3093 gamess-05272005.3-r1.ebuild 6664
+RMD160 dfb5a9315a7f033db3c4bfebb18d27e83ff6b02b gamess-05272005.3-r1.ebuild 6664
+SHA256 ac0b3c61205751a3da74ba3921b978f0c7a4bf69c06cf5623d5d50f07f589a54 gamess-05272005.3-r1.ebuild 6664
 MD5 189d64d4b2256ad8e759f5266216254c gamess-05272005.3-r2.ebuild 6664
+RMD160 acef606acd37f5b4b499f76c63e0b730394974c7 gamess-05272005.3-r2.ebuild 6664
+SHA256 825d0d5953bb9d74e582d8dbc83b4602ebdcff5a5c55d2753f4f9eddca9c1396 gamess-05272005.3-r2.ebuild 6664
 MD5 81efef3dd25f618ec470f589743f1882 gamess-05272005.3.ebuild 7057
-MD5 8215cbf09d5546ae271659d60f6fbd92 gamess-05272005.5.ebuild 6661
+RMD160 dc358050936540dc528f46b4f962b6e77780e89d gamess-05272005.3.ebuild 7057
+SHA256 b1ea3a5d68fbf78c0eebe2b4aa1a5bf2788e48d7f189551a6de1abe3b78cf51d gamess-05272005.3.ebuild 7057
+MD5 e46d4c93ac463f54a3c498c724bb0a64 gamess-05272005.5.ebuild 7371
+RMD160 d53af44d4d523595cc4dc349192e6bff11bf7a11 gamess-05272005.5.ebuild 7371
+SHA256 fa6b04af97dbe5fa480a1f564e33b24a73c9a12812a56221d674cb10940ec933 gamess-05272005.5.ebuild 7371
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
+RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
+SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
diff --git a/sci-chemistry/gamess/files/digest-gamess-05272005.5 b/sci-chemistry/gamess/files/digest-gamess-05272005.5
index d4a38562a6ba..d08e8a833279 100644
--- a/sci-chemistry/gamess/files/digest-gamess-05272005.5
+++ b/sci-chemistry/gamess/files/digest-gamess-05272005.5
@@ -1 +1,3 @@
 MD5 14a30f8c4c7113761ba84fd7a7da79e4 gamess-05272005.5.tar.gz 6378727
+RMD160 490ef43a52cc5001f580d2bda4c667b66986919f gamess-05272005.5.tar.gz 6378727
+SHA256 5d7b26a979df892c474016e45232b9a3b4a0c2209c5c32ecf7a0b83ceb6a5ddc gamess-05272005.5.tar.gz 6378727
diff --git a/sci-chemistry/gamess/gamess-05272005.5.ebuild b/sci-chemistry/gamess/gamess-05272005.5.ebuild
index 7d71ade144f3..f5c67a34910b 100644
--- a/sci-chemistry/gamess/gamess-05272005.5.ebuild
+++ b/sci-chemistry/gamess/gamess-05272005.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-05272005.5.ebuild,v 1.1 2006/01/20 17:23:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-05272005.5.ebuild,v 1.2 2006/02/08 21:54:55 markusle Exp $
 
-inherit eutils toolchain-funcs fortran
+inherit eutils toolchain-funcs fortran flag-o-matic
 
 DESCRIPTION="A powerful quantum chemistry package"
 LICENSE="gamess"
@@ -46,7 +46,7 @@ pkg_setup() {
 	if use ifc; then
 		need_fortran ifc
 	else
-		need_fortran g77
+		need_fortran gfortran g77
 	fi
 
 	# blas and ifc don't go together
@@ -70,10 +70,30 @@ src_unpack() {
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
 	cd "${S}"
-	if use hardened && [[ $(tc-getF77) = f77 ]]; then
+	if use hardened && ([[ ${FORTRANC} = g77 ]] \
+		|| [[ ${FORTRANC} == gfortran ]]); then
 		FFLAGS="${FFLAGS} -fno-stack-protector-all"
 	fi
 
+	# some fixes for gfortan; 
+	# also append -w otherwise we get flooded with Hollerith 
+	# constant warnings
+	if [[ ${FORTRANC} == gfortran ]]; then
+		FFLAGS="${FFLAGS} -w"
+
+		sed -e "s|-fno-move-all-movables|-w|g" \
+			-e "s|*F2C|*F77|g" \
+			-e "s|-Wno-globals -fno-globals||g" \
+			-e "s|zheev) set OPT='-O1'|zheev) set OPT='-O0 -w'|g" \
+			-i comp || die "Failed removing compile flags"
+
+		# need to use _gfortran_ namespace
+		sed -e "s|iargc_|_gfortran_iargc|g" \
+			-e "s|getarg_|_gfortran_getarg_i4|g" \
+			-i ddi/src/ddi_fortran.c || \
+			die "Failed to fix gfortran namespace in ddi_fortran.c"
+	fi
+
 	# greate proper activate sourcefile 
 	cp "./tools/actvte.code" "./tools/actvte.f" || \
 		die || "Failed to create actvte.f"
@@ -91,11 +111,11 @@ src_unpack() {
 		sed -e "s/-malign-double -fautomatic /-cm -w \$MODULE.f/" \
 			-e "s/-Wno-globals -fno-globals \$MODULE.f//" \
 			-e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS} -quiet'/" \
-		    -e "s/gentoo-g77/$(tc-getF77)/" \
+		    -e "s/gentoo-g77/${FORTANC}/" \
 			-i comp || die "Failed setting up comp script"
 	else
 		sed -e "s/gentoo-OPT = '-O2'/OPT = '${FFLAGS}'/" \
-		   	-e "s/gentoo-g77/$(tc-getF77)/" \
+		   	-e "s/gentoo-g77/${FORTRANC}/" \
 			-i comp || die "Failed setting up comp script"
 	fi
 
@@ -107,11 +127,11 @@ src_unpack() {
 
 	# fix up GAMESS' linker script;
 	if use ifc; then
-		sed -e "s/gentoo-LDR='g77'/LDR='$(tc-getF77)'/" \
+		sed -e "s/gentoo-LDR='g77'/LDR='${FORTRANC}'/" \
 		   	-e "s/gentoo-LDOPTS=' '/LDOPTS='${LDFLAGS}'/" \
 			-i lked || die "Failed setting up lked script"
 	else
-		sed -e "s/gentoo-LDR='g77'/LDR='$(tc-getF77)'/" \
+		sed -e "s/gentoo-LDR='g77'/LDR='${FORTRANC}'/" \
 			-e "s/gentoo-LDOPTS=' '/LDOPTS='${LDFLAGS}'/" \
 			-i lked || die "Failed patching lked script"
 	fi
@@ -120,9 +140,9 @@ src_unpack() {
 	sed -e "s/gentoo-CC = 'gcc'/CC = '$(tc-getCC)'/" \
 		-i ddi/compddi || die "Failed setting up compddi script"
 
-	# for ifc we have to fix the number of underscores of fortran
-	# symbols, otherwise the linker will barf
-	if use ifc; then
+	# for ifc/gcc-4.x we have to fix the number of underscores of 
+	# fortran symbols, otherwise the linker will barf
+	if use ifc || [[ $(gcc-major-version) -ge 4 ]]; then
 		sed -e "s/gentoo-F77_OPTS = '-DINT_SIZE=int -D_UNDERSCORES=2/F77_OPTS = '-DINT_SIZE=int -D_UNDERSCORES=1/" \
 			-i ddi/compddi || die "Failed fixing underscores in compddi"
 	else
@@ -134,7 +154,8 @@ src_unpack() {
 src_compile() {
 	# build actvte
 	cd "${S}"/tools
-	$(tc-getF77) -o actvte.x actvte.f || die "Failed to compile actvte.x"
+	${FORTRANC} -o actvte.x actvte.f || \
+		die "Failed to compile actvte.x"
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off