Fix for bug 348935

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

4 files changed, 14 insertions, 9 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 2a36898c11f3..f2e8f4f17515 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/mkl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.40 2010/12/17 08:24:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.41 2010/12/17 13:41:58 jlec Exp $
+
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org> mkl-9.1.023.ebuild,
+  mkl-10.0.2.018-r2.ebuild, mkl-10.0.5.025.ebuild:
+  Fix for bug 348935
 
   17 Dec 2010; Justin Lecher <jlec@gentoo.org> mkl-9.1.023.ebuild,
   mkl-10.0.2.018-r2.ebuild, mkl-10.0.5.025.ebuild:
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 554b68f2a294..19026f7a60c7 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.5 2010/12/17 08:24:38 jlec Exp $
+# $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 $
 
 inherit eutils toolchain-funcs check-reqs
 
@@ -39,6 +39,7 @@ get_fcomp() {
 			FCOMP=$(tc-getFC) ;;
 	esac
 }
+
 pkg_setup() {
 	# Check the license
 	if [[ -z ${MKL_LICENSE} ]]; then
@@ -60,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 3afe07a91f23..7f294ffab06d 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.7 2010/12/17 08:24:38 jlec Exp $
+# $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 $
 
 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 f95b2d55e1dc..6587195ea281 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.11 2010/12/17 08:24:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.12 2010/12/17 13:41:58 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//' \