Fix for fortran.eclass removal

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

9 files changed, 32 insertions, 25 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 96b736f032aa..8c1f99b079e4 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.82 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.83 2010/12/17 08:10:35 jlec Exp $
+
+  17 Dec 2010; Justin Lecher <jlec@gentoo.org> lapack-atlas-3.8.0.ebuild,
+  lapack-atlas-3.8.2.ebuild, lapack-atlas-3.9.3.ebuild,
+  lapack-atlas-3.9.21.ebuild, lapack-atlas-3.9.21-r1.ebuild,
+  lapack-atlas-3.9.23.ebuild, lapack-atlas-3.9.23-r2.ebuild,
+  lapack-atlas-3.9.23-r3.ebuild:
+  Fix for fortran.eclass removal
 
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> lapack-atlas-3.8.0.ebuild,
   lapack-atlas-3.8.2.ebuild, lapack-atlas-3.9.3.ebuild,
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild
index 7c0cc392e1d9..e6a522669028 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.8.0.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-atlas/lapack-atlas-3.8.0.ebuild,v 1.16 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild,v 1.17 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -121,8 +121,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild
index 884da664bc60..a99b829bbab5 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.8.2.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-atlas/lapack-atlas-3.8.2.ebuild,v 1.3 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild,v 1.4 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -118,8 +118,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild
index 5ced8d9d6a23..c157fdda13e2 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.21-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-atlas/lapack-atlas-3.9.21-r1.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild,v 1.3 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -131,8 +131,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild
index b5dc4e9bee3d..9f923802b803 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.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-atlas/lapack-atlas-3.9.21.ebuild,v 1.4 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild,v 1.5 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -131,8 +131,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild
index 1bd958afaf59..616677159e27 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-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/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.3 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.4 2010/12/17 08:10:35 jlec Exp $
 
 EAPI="3"
 
@@ -142,8 +142,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild
index bad6c696ff6d..04c8c6d2b9b6 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.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-atlas/lapack-atlas-3.9.23-r3.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild,v 1.3 2010/12/17 08:10:35 jlec Exp $
 
 EAPI="3"
 
@@ -143,8 +143,8 @@ src_compile() {
 	cp -sf "${BLD_DIR}"/gentoo/liblapack.a/.libs/*.o .libs/
 
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \
 	"${BLAS_LIBS}" -latlas ${flibs} \
 	-o "${S_LAPACK}"/SRC/liblapack.la *.lo -rpath "${EPREFIX}/${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild
index ee73c333531b..561c4fd460e1 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.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-atlas/lapack-atlas-3.9.23.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild,v 1.3 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -131,8 +131,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild
index 6dc35b508125..679fdb566503 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.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-atlas/lapack-atlas-3.9.3.ebuild,v 1.5 2010/12/16 14:32:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild,v 1.6 2010/12/17 08:10:35 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools versionator
 
@@ -131,8 +131,8 @@ src_compile() {
 
 	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
 	local flibs
-	[[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran
-	[[ $(tc-getFC) == g77 ]] && flibs=-lg2c
+	[[ $(tc-getFC) =~ gfortran ]] && flibs=-lgfortran
+	[[ $(tc-getFC) =~ g77 ]] && flibs=-lg2c
 	../libtool --mode=link --tag=F77 $(tc-getFC) \
 		$(pkg-config --libs blas cblas) -latlas ${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \