Removed ifc use flag and replaced it with fortran.eclass logic

Package-Manager: portage-2.1_rc2

3 files changed, 45 insertions, 48 deletions

diff --git a/sci-chemistry/gamess/ChangeLog b/sci-chemistry/gamess/ChangeLog
index c49ff9a7d0b8..8e9053bc5c29 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.12 2006/05/14 07:30:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.13 2006/05/23 13:29:17 markusle Exp $
+
+  23 May 2006; Markus Dittrich <markusle@gentoo.org>
+  gamess-20060222.2.ebuild:
+  Removed ifc use flag and replaced it with fortran.eclass logic.
 
   14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
   gamess-05272005.5.ebuild, gamess-20060222.2.ebuild:
diff --git a/sci-chemistry/gamess/Manifest b/sci-chemistry/gamess/Manifest
index c8950524bc0a..85c084cab486 100644
--- a/sci-chemistry/gamess/Manifest
+++ b/sci-chemistry/gamess/Manifest
@@ -1,58 +1,58 @@
-AUX comp-gentoo.patch 1276 RMD160 2c7017ceb0138dd192a1a72cf90dcff68f9a69b8 SHA1 3959ca68d90c48125040296be37dbf621f8cf36f SHA256 eb2cb647d2e48ed173cbebc24582d33743833a9345b1472ec2f6b6d28b592a0f size 1276
+AUX comp-gentoo.patch 1276 RMD160 2c7017ceb0138dd192a1a72cf90dcff68f9a69b8 SHA1 3959ca68d90c48125040296be37dbf621f8cf36f SHA256 eb2cb647d2e48ed173cbebc24582d33743833a9345b1472ec2f6b6d28b592a0f
 MD5 cc629344d268783ea8be555bd06249af files/comp-gentoo.patch 1276
 RMD160 2c7017ceb0138dd192a1a72cf90dcff68f9a69b8 files/comp-gentoo.patch 1276
 SHA256 eb2cb647d2e48ed173cbebc24582d33743833a9345b1472ec2f6b6d28b592a0f files/comp-gentoo.patch 1276
-AUX comp-lked-20060222.2.patch 3547 RMD160 a8b1a0a2e671ded8ea6dc72880c6858822cb88f2 SHA1 27f5451cde2f332bc29b669afbc084de0402b748 SHA256 1cca96ac59a1756f25c90efae67bfa00606dbfb97722054ba322b0e66d0c0206 size 3547
+AUX comp-lked-20060222.2.patch 3547 RMD160 a8b1a0a2e671ded8ea6dc72880c6858822cb88f2 SHA1 27f5451cde2f332bc29b669afbc084de0402b748 SHA256 1cca96ac59a1756f25c90efae67bfa00606dbfb97722054ba322b0e66d0c0206
 MD5 f35051be79ba967ce07ad02fcbcbccb1 files/comp-lked-20060222.2.patch 3547
 RMD160 a8b1a0a2e671ded8ea6dc72880c6858822cb88f2 files/comp-lked-20060222.2.patch 3547
 SHA256 1cca96ac59a1756f25c90efae67bfa00606dbfb97722054ba322b0e66d0c0206 files/comp-lked-20060222.2.patch 3547
-AUX compall-gentoo.patch 445 RMD160 0a50c20d0aade7a0bb39f973dd76792a6a01caa2 SHA1 391637e06c8617a2b6a2aa24626b978b3a5f766d SHA256 793e9b7047d1dfd5839a1d6b980c5bcc79477dd52bd1ca1034d1ef2949428beb size 445
+AUX compall-gentoo.patch 445 RMD160 0a50c20d0aade7a0bb39f973dd76792a6a01caa2 SHA1 391637e06c8617a2b6a2aa24626b978b3a5f766d SHA256 793e9b7047d1dfd5839a1d6b980c5bcc79477dd52bd1ca1034d1ef2949428beb
 MD5 88aa0ef3a19289c609a5167e2176bbf6 files/compall-gentoo.patch 445
 RMD160 0a50c20d0aade7a0bb39f973dd76792a6a01caa2 files/compall-gentoo.patch 445
 SHA256 793e9b7047d1dfd5839a1d6b980c5bcc79477dd52bd1ca1034d1ef2949428beb files/compall-gentoo.patch 445
-AUX compddi-gentoo.patch 975 RMD160 47134cdc3c2cdbd589d27d63f6af015490faf711 SHA1 3408b17d6f63d6ba98f4e402d541d92fcac7a93c SHA256 03afb475f2b6a164e4b6bac1192d5a71eef1586435a1e684e5c19ada81354e54 size 975
+AUX compddi-gentoo.patch 975 RMD160 47134cdc3c2cdbd589d27d63f6af015490faf711 SHA1 3408b17d6f63d6ba98f4e402d541d92fcac7a93c SHA256 03afb475f2b6a164e4b6bac1192d5a71eef1586435a1e684e5c19ada81354e54
 MD5 e980cc327bd2de746b91a395f1af3e0f files/compddi-gentoo.patch 975
 RMD160 47134cdc3c2cdbd589d27d63f6af015490faf711 files/compddi-gentoo.patch 975
 SHA256 03afb475f2b6a164e4b6bac1192d5a71eef1586435a1e684e5c19ada81354e54 files/compddi-gentoo.patch 975
-AUX ddi-use-ssh-gentoo.patch 518 RMD160 af1da3efe8341e437e4c98cd0aff7a892dce7241 SHA1 37a48286750c35775d940e461e1f9f86b6f59898 SHA256 e283de0eab10c2e3aecc10f6b6a760b4b7c9aec71c07c728929ca82a83459ccd size 518
+AUX ddi-use-ssh-gentoo.patch 518 RMD160 af1da3efe8341e437e4c98cd0aff7a892dce7241 SHA1 37a48286750c35775d940e461e1f9f86b6f59898 SHA256 e283de0eab10c2e3aecc10f6b6a760b4b7c9aec71c07c728929ca82a83459ccd
 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
-AUX gamess-glibc-2.4-gentoo.patch 1670 RMD160 d358496e8ef31fd18019253e4dda358f0e101b87 SHA1 62ce37da3eba58b1bfb7b93f5bfe2cee299492db SHA256 c8b3fda9a3916897e6d006ceb1545e8b56920566cf25942df61a14f8d85b99ad size 1670
+AUX gamess-glibc-2.4-gentoo.patch 1670 RMD160 d358496e8ef31fd18019253e4dda358f0e101b87 SHA1 62ce37da3eba58b1bfb7b93f5bfe2cee299492db SHA256 c8b3fda9a3916897e6d006ceb1545e8b56920566cf25942df61a14f8d85b99ad
 MD5 a62216bb611be7630594636f2b170b39 files/gamess-glibc-2.4-gentoo.patch 1670
 RMD160 d358496e8ef31fd18019253e4dda358f0e101b87 files/gamess-glibc-2.4-gentoo.patch 1670
 SHA256 c8b3fda9a3916897e6d006ceb1545e8b56920566cf25942df61a14f8d85b99ad files/gamess-glibc-2.4-gentoo.patch 1670
-AUX lked-gentoo.patch 783 RMD160 0dbf965aabc02e82bc818f2d0e55f76900ea2641 SHA1 54930e6ac9bca58385cd3f37cba653e78a04aadd SHA256 7d2f513c6413fcd25a0e8566272db72e48e08c75edcf34f4e12fc0a98fddf71d size 783
+AUX lked-gentoo.patch 783 RMD160 0dbf965aabc02e82bc818f2d0e55f76900ea2641 SHA1 54930e6ac9bca58385cd3f37cba653e78a04aadd SHA256 7d2f513c6413fcd25a0e8566272db72e48e08c75edcf34f4e12fc0a98fddf71d
 MD5 d2f6837d02ac960e7bed4addf9632eec files/lked-gentoo.patch 783
 RMD160 0dbf965aabc02e82bc818f2d0e55f76900ea2641 files/lked-gentoo.patch 783
 SHA256 7d2f513c6413fcd25a0e8566272db72e48e08c75edcf34f4e12fc0a98fddf71d files/lked-gentoo.patch 783
-AUX runall-gentoo.1.patch 483 RMD160 12199477c3fa86a8f2132538f45c8cf786b863e6 SHA1 8e6b4717501734c79b1658801a31de7743e06acf SHA256 40226df377cea8e8f43e364efed797ec22c82edf0fa92da51338315d583ea4e2 size 483
+AUX runall-gentoo.1.patch 483 RMD160 12199477c3fa86a8f2132538f45c8cf786b863e6 SHA1 8e6b4717501734c79b1658801a31de7743e06acf SHA256 40226df377cea8e8f43e364efed797ec22c82edf0fa92da51338315d583ea4e2
 MD5 e4d9a65b9c8e365bf2e4f2de8a5e1e55 files/runall-gentoo.1.patch 483
 RMD160 12199477c3fa86a8f2132538f45c8cf786b863e6 files/runall-gentoo.1.patch 483
 SHA256 40226df377cea8e8f43e364efed797ec22c82edf0fa92da51338315d583ea4e2 files/runall-gentoo.1.patch 483
-AUX rungms-gentoo.1.patch 1804 RMD160 d800937c118bac2dc93390a666db548d26f4273f SHA1 afad4575c2d7cefc56d66d6c66aeddbd24b73ab5 SHA256 0defb144336b97b5cf816a80e509133b74f55c75a909884f25296663f377a486 size 1804
+AUX rungms-gentoo.1.patch 1804 RMD160 d800937c118bac2dc93390a666db548d26f4273f SHA1 afad4575c2d7cefc56d66d6c66aeddbd24b73ab5 SHA256 0defb144336b97b5cf816a80e509133b74f55c75a909884f25296663f377a486
 MD5 549e3fee1dda6f731af6c5da281e5fd7 files/rungms-gentoo.1.patch 1804
 RMD160 d800937c118bac2dc93390a666db548d26f4273f files/rungms-gentoo.1.patch 1804
 SHA256 0defb144336b97b5cf816a80e509133b74f55c75a909884f25296663f377a486 files/rungms-gentoo.1.patch 1804
-AUX rungms-runall-20060222.2.patch 2293 RMD160 22b884e347d08a2041006a7789a7e9daf3d83483 SHA1 765a47c862ce228400f1eb490dafa5984f8ba47a SHA256 6b995a78ca1b74e2936f553e8cc286303211d040c9f35a8c540f4b8ce88ae331 size 2293
+AUX rungms-runall-20060222.2.patch 2293 RMD160 22b884e347d08a2041006a7789a7e9daf3d83483 SHA1 765a47c862ce228400f1eb490dafa5984f8ba47a SHA256 6b995a78ca1b74e2936f553e8cc286303211d040c9f35a8c540f4b8ce88ae331
 MD5 8088ad360fe8b034b5b36deeac7a9a3b files/rungms-runall-20060222.2.patch 2293
 RMD160 22b884e347d08a2041006a7789a7e9daf3d83483 files/rungms-runall-20060222.2.patch 2293
 SHA256 6b995a78ca1b74e2936f553e8cc286303211d040c9f35a8c540f4b8ce88ae331 files/rungms-runall-20060222.2.patch 2293
-DIST gamess-05272005.5.tar.gz 6378727 RMD160 490ef43a52cc5001f580d2bda4c667b66986919f SHA256 5d7b26a979df892c474016e45232b9a3b4a0c2209c5c32ecf7a0b83ceb6a5ddc size 6378727
-DIST gamess-20060222.2.tar.gz 6438153 RMD160 e833f0562591ac1bc56b88653012733e63025b6f SHA256 480c21c3c684fe384cb6612438b9e2112588ce7518a3fe1c82643e8a69edc304 size 6438153
-EBUILD gamess-05272005.5.ebuild 7360 RMD160 2cdc1f7ac48e7c488c4cf8ac4f92c7450cc59e38 SHA1 2b58089d5e186afdf9b22eb46b7807687d4a6b1a SHA256 a5899b110e1c5b4278eaefb2e33c17da44c0e38d6b3b4120947ac467254ff889 size 7360
+DIST gamess-05272005.5.tar.gz 6378727 RMD160 490ef43a52cc5001f580d2bda4c667b66986919f SHA1 da8cb4d1547da7eff6c8c184e3cd4719516b173f SHA256 5d7b26a979df892c474016e45232b9a3b4a0c2209c5c32ecf7a0b83ceb6a5ddc
+DIST gamess-20060222.2.tar.gz 6438153 RMD160 e833f0562591ac1bc56b88653012733e63025b6f SHA1 f31cd02beb8e3f38772be416a7d1d6c7bee9a579 SHA256 480c21c3c684fe384cb6612438b9e2112588ce7518a3fe1c82643e8a69edc304
+EBUILD gamess-05272005.5.ebuild 7360 RMD160 2cdc1f7ac48e7c488c4cf8ac4f92c7450cc59e38 SHA1 2b58089d5e186afdf9b22eb46b7807687d4a6b1a SHA256 a5899b110e1c5b4278eaefb2e33c17da44c0e38d6b3b4120947ac467254ff889
 MD5 2e99431f9000233fead8ad621172a5e5 gamess-05272005.5.ebuild 7360
 RMD160 2cdc1f7ac48e7c488c4cf8ac4f92c7450cc59e38 gamess-05272005.5.ebuild 7360
 SHA256 a5899b110e1c5b4278eaefb2e33c17da44c0e38d6b3b4120947ac467254ff889 gamess-05272005.5.ebuild 7360
-EBUILD gamess-20060222.2.ebuild 7586 RMD160 9422a3f0eb47c7d6394d60aae8c0cd8823d43a52 SHA1 7278e4f4a09d507fc437b7bd98a7d9e2c2d8a667 SHA256 9599ef0c379900f8ddc564fae5b74d270bd44d39d098445cdd72f972d1bfa4a4 size 7586
-MD5 bcde89435485d0fc4a4f21d0838a5b68 gamess-20060222.2.ebuild 7586
-RMD160 9422a3f0eb47c7d6394d60aae8c0cd8823d43a52 gamess-20060222.2.ebuild 7586
-SHA256 9599ef0c379900f8ddc564fae5b74d270bd44d39d098445cdd72f972d1bfa4a4 gamess-20060222.2.ebuild 7586
-MISC ChangeLog 3404 RMD160 679f1b82fd887fd2161d10301c0e61da1f3115eb SHA1 3a2a83663100a3598b95d693f060b16964bf494d SHA256 04a616d02b59c5394350f535f17ff9039d07558f19b1ec2ad71b0e07d657677d size 3404
-MD5 c99ab3a102fdebbf3b42a88d54c0f38c ChangeLog 3404
-RMD160 679f1b82fd887fd2161d10301c0e61da1f3115eb ChangeLog 3404
-SHA256 04a616d02b59c5394350f535f17ff9039d07558f19b1ec2ad71b0e07d657677d ChangeLog 3404
-MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 size 254
+EBUILD gamess-20060222.2.ebuild 7555 RMD160 6b4c2d081e041232e5ec90af07b6b5579bfde2a9 SHA1 d6248fd366411becd4d7e0a2595d36e9f2aeb417 SHA256 cc6eebd2acb77f78040317b8acfb38d66b940b230dbf67a70971efda00f8b506
+MD5 cd705cee5a160d3b51e39ccf9932b4c9 gamess-20060222.2.ebuild 7555
+RMD160 6b4c2d081e041232e5ec90af07b6b5579bfde2a9 gamess-20060222.2.ebuild 7555
+SHA256 cc6eebd2acb77f78040317b8acfb38d66b940b230dbf67a70971efda00f8b506 gamess-20060222.2.ebuild 7555
+MISC ChangeLog 3551 RMD160 797d23798b71605b002b628a6a6af57b637098ac SHA1 8b5845159b04e299754b4173a262a21ff4a1acd9 SHA256 e5aa603c007d4996e3c7e72a8c9c1b2eb1e618226145209f19714a87d1beda9d
+MD5 446e8e78a1d24a27d83d004728aef294 ChangeLog 3551
+RMD160 797d23798b71605b002b628a6a6af57b637098ac ChangeLog 3551
+SHA256 e5aa603c007d4996e3c7e72a8c9c1b2eb1e618226145209f19714a87d1beda9d ChangeLog 3551
+MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
diff --git a/sci-chemistry/gamess/gamess-20060222.2.ebuild b/sci-chemistry/gamess/gamess-20060222.2.ebuild
index 48351c1b902f..40e9eb2f7832 100644
--- a/sci-chemistry/gamess/gamess-20060222.2.ebuild
+++ b/sci-chemistry/gamess/gamess-20060222.2.ebuild
@@ -1,6 +1,6 @@
 # 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-20060222.2.ebuild,v 1.4 2006/05/14 07:30:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20060222.2.ebuild,v 1.5 2006/05/23 13:29:17 markusle Exp $
 
 inherit eutils toolchain-funcs fortran flag-o-matic
 
@@ -11,24 +11,22 @@ SRC_URI="${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="ifc hardened blas"
+IUSE="hardened blas"
 
 RESTRICT="fetch"
 
 DEPEND="app-shells/tcsh
-	ifc? ( >=dev-lang/ifc-8.1 )
 	hardened? ( sys-apps/paxctl )
 	blas? ( virtual/blas )"
 
 RDEPEND="app-shells/tcsh
-	net-misc/openssh
-	ifc? ( >=dev-lang/ifc-8.1 )"
+	net-misc/openssh"
 
 S="${WORKDIR}/${PN}"
 
 GAMESS_DOWNLOAD="http://www.msg.ameslab.gov/GAMESS/License_Agreement.html"
 GAMESS_VERSION="22 FEB 2006 (R2)"
-
+FORTRAN="ifc g77 gfortran"
 
 pkg_nofetch() {
 	echo
@@ -41,17 +39,11 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	# make sure we have the proper fortan compiler; 
-	# use ifc for USE="ifc" and g77 otherwise
-	if use ifc; then
-		need_fortran ifc
-	else
-		need_fortran gfortran g77
-	fi
+	fortran_pkg_setup
 
 	# blas and ifc don't go together
-	if use blas && use ifc; then
-		die  "${PN} can not be compiled with USE=blas and USE=ifc"
+	if use blas && [[ "${FORTRANC}" = "ifc" ]]; then
+		die  "${PN} can not be compiled with USE=blas and ifc"
 	fi
 }
 
@@ -67,14 +59,14 @@ src_unpack() {
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines
 	cd "${S}"
-	if use hardened && ([[ ${FORTRANC} = g77 ]]); then
+	if use hardened && [[ "${FORTRANC}" = "g77" ]]; 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
+	if [[ "${FORTRANC}" == "gfortran" ]]; then
 		FFLAGS="${FFLAGS} -w"
 
 		sed -e "s|-fno-move-all-movables|-w|g" \
@@ -102,11 +94,11 @@ src_unpack() {
 	# insert proper FFLAGS into GAMESS' comp makefile
 	# in case we're using ifc let's strip all the gcc
 	# specific stuff
-	if use ifc; then
+	if [[ "${FORTRANC}" == "ifc" ]]; then
 		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/${FORTANC}/" \
+			-e "s/gentoo-g77/${FORTRANC}/" \
 			-i comp || die "Failed setting up comp script"
 	elif ! use x86; then
 		sed -e "s/-malign-double //" \
@@ -126,7 +118,7 @@ src_unpack() {
 	fi
 
 	# fix up GAMESS' linker script;
-	if use ifc; then
+	if [[ "${FORTRANC}" == "ifc" ]]; then
 		sed -e "s/gentoo-LDR='g77'/LDR='${FORTRANC}'/" \
 			-e "s/gentoo-LDOPTS=' '/LDOPTS='${LDFLAGS}'/" \
 			-i lked || die "Failed setting up lked script"
@@ -142,7 +134,8 @@ src_unpack() {
 
 	# 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
+	if [[ "${FORTRANC}" == "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
@@ -154,12 +147,12 @@ src_unpack() {
 src_compile() {
 	# build actvte
 	cd "${S}"/tools
-	${FORTRANC} -o actvte.x actvte.f || \
+	"${FORTRANC}" -o actvte.x actvte.f || \
 		die "Failed to compile actvte.x"
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if use ifc && use hardened; then
+	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
 		/sbin/paxctl -PemRxS actvte.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -178,7 +171,7 @@ src_compile() {
 
 	# for hardened (PAX) users and ifc we need to turn
 	# MPROTECT off
-	if use ifc && use hardened; then
+	if [[ "${FORTRANC}" == "ifc" ]] && use hardened; then
 		/sbin/paxctl -PemRxS ${PN}.00.x 2> /dev/null || \
 			die "paxctl failed on actvte.x"
 	fi
@@ -234,7 +227,7 @@ pkg_postinst() {
 		ewarn "have been addressed."
 	fi
 
-	if use ifc; then
+	if [[ "${FORTRANC}" == "ifc" ]]; 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"