Fix for fortran detection, thanks Arfrever pointing on it

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

4 files changed, 15 insertions, 15 deletions

diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 0b3ed8b3929d..dfd8ad9a30fa 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -10,15 +10,15 @@ DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58
 DIST l_mkl_p_10.0.2.018.tgz 227440983 RMD160 0c28416597ef917328193fa0c6403d7c0e7b971d SHA1 1aa8c47701b142ab52ebcda27fdda4c5d0903471 SHA256 311d2885a33d553a2d1b1370eed1e3e9bccc246f2dcd20e3558ed492443ba20f
 DIST l_mkl_p_10.0.5.025.tgz 230389719 RMD160 b961c3ce36795b3aae2d22badbcf1bbb5bd29d63 SHA1 a052b3ad6163dab7a29911eb408ca6577507f492 SHA256 c98f2c5c652c02ac7200cba40d996b1f11b567278d849016b7ee3b0320e26e3c
 DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd
-EBUILD mkl-10.0.2.018-r2.ebuild 9838 RMD160 36f607dc4c944ee7148000ff6dbb9d14c80b2527 SHA1 7f440b4964b660d56c81accfcc5b0d506ca90468 SHA256 fe292f71b541ce4f7f1964f2fdac7b984eb71c4da17d18ecfb4af3e45fbb2c13
-EBUILD mkl-10.0.5.025.ebuild 9987 RMD160 ccfffa4c6ec958cbb5eddcdbb0811692fee2b692 SHA1 e2f4793b5219f084e28ed90bfbeca78de30ebebb SHA256 7b88ec4d088c849bcf5c787a92e2a1587df6957eaee5196624bf87c12c38335c
-EBUILD mkl-9.1.023.ebuild 8881 RMD160 a08917b3c1dec30cce21cf18addeb7c9d10fee2f SHA1 f719072c92c8e52a9db0d76c15e473a130a14c82 SHA256 798d2cd290533fcb84bcd07a0a695a7f324cccf713181c6807d39e481e237d16
+EBUILD mkl-10.0.2.018-r2.ebuild 9834 RMD160 55a6cd5e617411d266a913aaaa89061ce6501d90 SHA1 e4df72da814fdc4585164e3de2202ba3459652ae SHA256 0f6d11f59e96c596a3a30d9a6343c36ede02c3b02666237a69305c3cae04af9c
+EBUILD mkl-10.0.5.025.ebuild 9983 RMD160 b683127d3d665f3c9913e7899e164646bd823b8f SHA1 9a84d409dcb7ba814cd01418999f05a8359c3898 SHA256 bf95e81d44c398e6d74a0ee8dca14fac3f910b7abc1134722142196193a3b561
+EBUILD mkl-9.1.023.ebuild 8879 RMD160 85ce5569d89e239fcf686e25077a6295784d2a6d SHA1 89b420bcbf2f91c9589f24d2431825c69fa57f3c SHA256 71c96f14d5e0a32296157e8909d51dc9fb60340fc9ade63d5fbdb87928e40a8f
 MISC ChangeLog 8861 RMD160 d940c0a4fe1d548bd05e30ceef92f220a5239eb0 SHA1 b7a931f830c0e471e8b4008fb4e5a114bb1c0b8e SHA256 da3a97a6d52cb53f22a9171294e45f8ed4252187eaa40d50a1b89fbc20d70dae
 MISC metadata.xml 858 RMD160 40285d03152575e5d0cb91abc9fb61c1af3e7abc SHA1 88f8f122cfdf350a8fcff81f72b2c056438ffe37 SHA256 fcff9afd76b48ea7e812ea8a32a78ab8325379ce28e0893032d46c06d00a5a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0LaK4ACgkQgAnW8HDreRbNmACcCryAMHQjKnvOQNcIfLunmWyv
-TUUAoKC8CuRYnOU00GjizA9S+F0npNKz
-=a3/g
+iEYEARECAAYFAk0OTZoACgkQgAnW8HDreRZuyQCgl1nyIGI3QlKAkDukeHi8nLcq
+WYIAoMH/1uAAAlBht3eQ8s4MPh0nAikr
+=esF9
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild b/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild
index 19026f7a60c7..bd12e295e8d5 100644
--- a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild
+++ b/sci-libs/mkl/mkl-10.0.2.018-r2.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-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.6 2010/12/17 13:41:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.7 2010/12/19 18:23:16 jlec Exp $
 
 inherit eutils toolchain-funcs check-reqs
 
@@ -61,11 +61,11 @@ pkg_setup() {
 	# Check and setup fortran
 	if use fortran95; then
 		# blas95 and lapack95 don't compile with gfortran < 4.2
-		[[ $(tc-getFC) =~ g.* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
+		[[ $(tc-getFC) =~ g ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
 		die "blas95 and lapack95 don't compile with gfortran < 4.2"
 	fi
 	MKL_FC="gnu"
-	[[ $(tc-getFC) =~ if.* ]] && MKL_FC="intel"
+	[[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
 
 	# build profiles according to what compiler is installed
 	MKL_CC="gnu"
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index 7f294ffab06d..5a414f5fc0e7 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.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-libs/mkl/mkl-10.0.5.025.ebuild,v 1.8 2010/12/17 13:41:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.5.025.ebuild,v 1.9 2010/12/19 18:23:16 jlec Exp $
 
 inherit eutils toolchain-funcs check-reqs
 
@@ -61,11 +61,11 @@ pkg_setup() {
 	# Check and setup fortran
 	if use fortran95; then
 		# blas95 and lapack95 don't compile with gfortran < 4.2
-		[[ $(tc-getFC) =~ g.* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
+		[[ $(tc-getFC) =~ g ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
 		die "blas95 and lapack95 don't compile with gfortran < 4.2"
 	fi
 	MKL_FC="gnu"
-	[[ $(tc-getFC) =~ if.* ]] && MKL_FC="intel"
+	[[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
 
 	# build profiles according to what compiler is installed
 	MKL_CC="gnu"
diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild
index 6587195ea281..606909132a2b 100644
--- a/sci-libs/mkl/mkl-9.1.023.ebuild
+++ b/sci-libs/mkl/mkl-9.1.023.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-libs/mkl/mkl-9.1.023.ebuild,v 1.12 2010/12/17 13:41:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.13 2010/12/19 18:23:16 jlec Exp $
 
 inherit eutils versionator toolchain-funcs
 
@@ -137,7 +137,7 @@ src_unpack() {
 	fi
 
 	# fix a bad makefile in the test
-	if [[ $(tc-getFC) =~ gfortran ]] || [[ $(tc-getFC) =~ if.* ]]; then
+	if [[ $(tc-getFC) =~ gfortran ]] || [[ $(tc-getFC) =~ if ]]; then
 		sed -i \
 			-e "s/g77/$(tc-getFC)/" \
 			-e 's/-DGNU_USE//' \
@@ -181,7 +181,7 @@ src_compile() {
 
 src_test() {
 	local usegnu
-	[[ $(tc-getFC) = g* ]] && usegnu=gnu
+	[[ $(tc-getFC) =~ g ]] && usegnu=gnu
 	# restrict tests for blas and cblas for now.
 	# for t in blas cblas fft*; do
 	for t in blas lapack; do