Fix for bug 348935

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

12 files changed, 40 insertions, 50 deletions

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index 9bd83a200120..00a031f606b1 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/blas-reference
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.49 2010/12/17 08:09:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.50 2010/12/17 13:35:46 jlec Exp $
+
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org> blas-reference-20070226.ebuild,
+  blas-reference-20070226-r1.ebuild, blas-reference-20070226-r2.ebuild:
+  Fix for bug 348935
 
   17 Dec 2010; Justin Lecher <jlec@gentoo.org> blas-reference-20070226.ebuild,
   blas-reference-20070226-r1.ebuild, blas-reference-20070226-r2.ebuild:
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
index 6b8c0a61b905..c7c8e5b6e00b 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r1.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/blas-reference/blas-reference-20070226-r1.ebuild,v 1.4 2010/12/17 08:09:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild,v 1.5 2010/12/17 13:35:46 jlec Exp $
 
 EAPI="3"
 
@@ -24,15 +24,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
 
-pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		LDFLAGS="$(raw-ldflags)"
-	fi
-	ESELECT_PROF=reference
-}
-
 src_prepare() {
+	ESELECT_PROF=reference
 	epatch "${FILESDIR}"/${P}-autotool.patch
 	eautoreconf
 
@@ -46,8 +39,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
-		|| die "econf failed"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
 }
 
 src_compile() {
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
index 5cc9f261cf9a..6cbbd0e6be55 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-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/blas-reference/blas-reference-20070226-r2.ebuild,v 1.3 2010/12/17 08:09:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.4 2010/12/17 13:35:46 jlec Exp $
 
 EAPI="3"
 
@@ -24,15 +24,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
 
-pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		LDFLAGS="$(raw-ldflags)"
-	fi
-	ESELECT_PROF=reference
-}
-
 src_prepare() {
+	ESELECT_PROF=reference
 	epatch \
 		"${FILESDIR}"/${P}-autotool.patch \
 		"${FILESDIR}"/${P}-pkg-config.patch
@@ -48,8 +41,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
-		|| die "econf failed"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
 }
 
 src_compile() {
diff --git a/sci-libs/blas-reference/blas-reference-20070226.ebuild b/sci-libs/blas-reference/blas-reference-20070226.ebuild
index eee00d38399d..f2455d4f0075 100644
--- a/sci-libs/blas-reference/blas-reference-20070226.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226.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/blas-reference/blas-reference-20070226.ebuild,v 1.20 2010/12/17 08:09:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.21 2010/12/17 13:35:46 jlec Exp $
 
 inherit eutils autotools multilib flag-o-matic toolchain-funcs
 
@@ -22,15 +22,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
 
-pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		LDFLAGS="$(raw-ldflags)"
-	fi
-	ESELECT_PROF=reference
-}
-
 src_unpack() {
+	ESELECT_PROF=reference
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-autotool.patch
@@ -39,8 +32,7 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		--libdir=/usr/$(get_libdir)/blas/reference \
-		|| die "econf failed"
+		--libdir=/usr/$(get_libdir)/blas/reference
 	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index d12efddda4b0..0342acea40f5 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/lapack-reference
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.53 2010/12/17 08:10:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.54 2010/12/17 13:39:18 jlec Exp $
+
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild, lapack-reference-3.2.1.ebuild,
+  lapack-reference-3.2.1-r1.ebuild:
+  Fix for bug 348935
 
   17 Dec 2010; Justin Lecher <jlec@gentoo.org>
   lapack-reference-3.1.1-r1.ebuild, lapack-reference-3.2.1.ebuild,
diff --git a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild
index 6e6833e70fdd..eae497ea62a4 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.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/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.22 2010/12/17 08:10:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.23 2010/12/17 13:39:18 jlec Exp $
 
 inherit eutils autotools flag-o-matic multilib toolchain-funcs
 
@@ -26,7 +26,7 @@ RDEPEND="virtual/blas
 S="${WORKDIR}/${MyPN}-lite-${PV}"
 
 pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
+	if  [[ $(tc-getFC) =~ if.* ]]; then
 		ewarn "Using Intel Fortran at your own risk"
 		export LDFLAGS="$(raw-ldflags)"
 		export NOOPT_FFLAGS=-O
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild
index 8667d035fe33..5f4e4e40a277 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.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/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.4 2010/12/17 08:10:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.5 2010/12/17 13:39:18 jlec Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ RDEPEND="virtual/blas
 S="${WORKDIR}/${MyPN}-${PV}"
 
 pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
+	if  [[ $(tc-getFC) =~ if.* ]]; then
 		ewarn "Using Intel Fortran at your own risk"
 		export LDFLAGS="$(raw-ldflags)"
 		export NOOPT_FFLAGS=-O
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
index 758b8894da9d..0c585c4156c5 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1.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/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.4 2010/12/17 08:10:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.5 2010/12/17 13:39:18 jlec Exp $
 
 inherit eutils autotools flag-o-matic multilib toolchain-funcs
 
@@ -27,7 +27,7 @@ RDEPEND="virtual/blas
 S="${WORKDIR}/${MyPN}-${PV}"
 
 pkg_setup() {
-	if  [[ $(tc-getFC) =~ if* ]]; then
+	if  [[ $(tc-getFC) =~ if.* ]]; then
 		ewarn "Using Intel Fortran at your own risk"
 		export LDFLAGS="$(raw-ldflags)"
 		export NOOPT_FFLAGS=-O
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//' \