Removed ifc use flag (see bug #97929)

(Portage version: 2.1.4.4)

4 files changed, 29 insertions, 101 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 9698a2f2bdf8..7d10f67b663a 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.60 2008/02/23 11:13:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.61 2008/04/06 11:27:10 bicatali Exp $
+
+  06 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  lapack-atlas-3.6.0.ebuild, lapack-atlas-3.7.11.ebuild,
+  lapack-atlas-3.7.11-r1.ebuild:
+  Removed ifc use flag (see bug #97929)
 
 *lapack-atlas-3.8.1 (23 Feb 2008)
 
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
index 2e509428d9c0..31683e6b30a0 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6.0.ebuild,v 1.15 2008/02/23 11:13:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild,v 1.16 2008/04/06 11:27:10 bicatali Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -17,17 +17,15 @@ SRC_URI="${SRC_URI1} ${SRC_URI2}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="ifc doc"
+IUSE="doc"
 
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.5
 	~sci-libs/blas-atlas-3.6.0
-	sci-libs/lapack-config
-	ifc? ( dev-lang/ifc )"
+	sci-libs/lapack-config"
 
 RDEPEND="virtual/libc
-	virtual/blas
-	ifc? ( dev-lang/ifc )" # Need Intel runtime libraries
+	virtual/blas"
 
 S=${WORKDIR}/ATLAS
 S_LAPACK=${WORKDIR}/LAPACK
@@ -36,38 +34,9 @@ TOP_PATH="${DESTTREE}/lib/lapack"
 # Path where libraries will be installed:
 RPATH="${TOP_PATH}/atlas"
 
-ifc_info() {
-	if [ -z "${IFCFLAGS}" ]
-	then
-		einfo
-		einfo "You may want to set some ifc optimization flags by running this"
-		einfo "ebuild as, for example:"
-		einfo
-		einfo "IFCFLAGS=\"-O3 -tpp7 -xW\" emerge lapack-atlas"
-		einfo "(Pentium 4 exclusive optimizations)."
-		einfo
-		einfo "ifc defaults to -O2, with code tuned for Pentium 4, but that"
-		einfo "will run on any processor."
-		einfo
-		einfo "Beware that ifc's -O3 is very aggressive, sometimes resulting in"
-		einfo "significantly worse performance."
-		einfo
-	fi
-}
-
-pkg_setup() {
-	# We need g77 to compile the LAPACK routines from ATLAS.
-	# `use ifc` only causes the non-ATLAS routines (from the
-	#  reference set) to be built with ifc.
-	if [[ -z `type -P g77` ]]; then
-		eerror "g77 not found on the system!"
-		eerror "Please add fortran to your USE flags and reemerge gcc!"
-		die
-	fi
-}
+FORTRAN="ifc g77"
 
 src_unpack() {
-	use ifc && ifc_info
 	unpack ${A}
 
 	cd "${WORKDIR}"
@@ -114,10 +83,9 @@ src_compile() {
 	make lib CC="${CC}" F77="libtool --mode=compile --tag=F77 g77" || die
 
 	cd ${S_LAPACK}
-	if use ifc
+	if [[ ${FORTRANC} = if* ]]
 	then
-		FC="ifc"
-		FFLAGS="${IFCFLAGS}"
+		FC="${FORTRANC}"
 		NOOPT="-O0" # Do NOT change this. It is applied to two files with
 					# routines to determine machine constants.
 	else
@@ -137,9 +105,9 @@ src_compile() {
 	cp -sf "${S}"/gentoo/liblapack.a/*.lo .
 	cp -sf "${S}"/gentoo/liblapack.a/.libs/*.o .libs/
 
-	if use ifc
+	if [[ ${FORTRAN} = if* ]]
 	then
-		ifc ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
+		${FORTRANC} ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
 			-o liblapack.so.0.0.0 -lblas -lcblas -latlas \
 			-L$(gcc-config -L) -lg2c
 		ar cru liblapack.a *.o
@@ -154,7 +122,7 @@ src_install () {
 	dodir ${RPATH}
 
 	cd ${S_LAPACK}/SRC
-	if use ifc
+	if [[ ${FORTRANC} = if* ]]
 	then
 		strip --strip-unneeded liblapack.so.0.0.0
 		strip --strip-debug liblapack.a
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
index b71a4e6ad6ff..c93c0ee4f68e 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.7.11-r1.ebuild,v 1.10 2008/02/23 11:13:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild,v 1.11 2008/04/06 11:27:10 bicatali Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -16,13 +16,12 @@ SRC_URI="${SRC_URI1} ${SRC_URI2}
 	mirror://gentoo/${MY_PN}3.6.0-shared-libs.3.patch.bz2"
 
 SLOT="0"
-IUSE="ifc doc"
+IUSE="doc"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="virtual/libc
 	app-admin/eselect-lapack
-	virtual/blas
-	ifc? ( dev-lang/ifc )" # Need Intel runtime libraries
+	virtual/blas"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5
@@ -37,27 +36,7 @@ TOP_PATH="${DESTTREE}/$(get_libdir)/lapack"
 # Path where libraries will be installed:
 RPATH="${TOP_PATH}/atlas"
 
-ifc_info() {
-	if [ -z "${IFCFLAGS}" ]
-	then
-		elog
-		elog "You may want to set some ifc optimization flags by running this"
-		elog "ebuild as, for example:"
-		elog
-		elog "IFCFLAGS=\"-O3 -tpp7 -xW\" emerge lapack-atlas"
-		elog "(Pentium 4 exclusive optimizations)."
-		elog
-		elog "ifc defaults to -O2, with code tuned for Pentium 4, but that"
-		elog "will run on any processor."
-		elog
-		elog "Beware that ifc's -O3 is very aggressive, sometimes resulting in"
-		elog "significantly worse performance."
-		elog
-	fi
-}
-
 src_unpack() {
-	use ifc && ifc_info
 	unpack ${A}
 
 	cd "${WORKDIR}"
@@ -131,8 +110,7 @@ src_compile() {
 		|| die "Failed to make lib in ${S}/interfaces/lapack/F77/src/${ATLAS_ARCH}"
 
 	cd "${S_LAPACK}"
-	if use ifc; then
-		FFLAGS="${IFCFLAGS}"
+	if [[ ${FORTRANC} = if* ]]; then
 		NOOPT="-O0" # Do NOT change this. It is applied to two files with
 					# routines to determine machine constants.
 	else
@@ -162,7 +140,7 @@ src_compile() {
 	fi
 	einfo "Fortran library is ${FORTRANLIB}"
 
-	if use ifc; then
+	if [[ ${FORTRANC} = if* ]]; then
 		${FORTRANC} ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
 			-o liblapack.so.0.0.0 -lblas -lcblas -latlas \
 			-L$(gcc-config -L) ${FORTRANLIB} \
@@ -180,7 +158,7 @@ src_install () {
 	dodir "${RPATH}"
 
 	cd "${S_LAPACK}"/SRC
-	if use ifc; then
+	if [[ ${FORTRANC} = if* ]]; then
 		strip --strip-unneeded liblapack.so.0.0.0 || die
 		strip --strip-debug liblapack.a || die
 
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
index 481cec920af3..56ce4ef37db7 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.7.11.ebuild,v 1.16 2008/02/23 11:13:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild,v 1.17 2008/04/06 11:27:10 bicatali Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -16,18 +16,16 @@ SRC_URI="${SRC_URI1} ${SRC_URI2}
 	mirror://gentoo/${MY_PN}3.6.0-shared-libs.3.patch.bz2"
 
 SLOT="0"
-IUSE="ifc doc"
+IUSE="doc"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.5
 	~sci-libs/blas-atlas-3.7.11
-	sci-libs/lapack-config
-	ifc? ( dev-lang/ifc )"
+	sci-libs/lapack-config"
 
 RDEPEND="virtual/libc
-	virtual/blas
-	ifc? ( dev-lang/ifc )" # Need Intel runtime libraries
+	virtual/blas"
 
 FORTRAN="g77 gfortran ifc"
 
@@ -38,27 +36,7 @@ TOP_PATH="${DESTTREE}/$(get_libdir)/lapack"
 # Path where libraries will be installed:
 RPATH="${TOP_PATH}/atlas"
 
-ifc_info() {
-	if [ -z "${IFCFLAGS}" ]
-	then
-		einfo
-		einfo "You may want to set some ifc optimization flags by running this"
-		einfo "ebuild as, for example:"
-		einfo
-		einfo "IFCFLAGS=\"-O3 -tpp7 -xW\" emerge lapack-atlas"
-		einfo "(Pentium 4 exclusive optimizations)."
-		einfo
-		einfo "ifc defaults to -O2, with code tuned for Pentium 4, but that"
-		einfo "will run on any processor."
-		einfo
-		einfo "Beware that ifc's -O3 is very aggressive, sometimes resulting in"
-		einfo "significantly worse performance."
-		einfo
-	fi
-}
-
 src_unpack() {
-	use ifc && ifc_info
 	unpack ${A}
 
 	cd "${WORKDIR}"
@@ -132,8 +110,7 @@ src_compile() {
 		|| die "Failed to make lib in ${S}/interfaces/lapack/F77/src/${ATLAS_ARCH}"
 
 	cd "${S_LAPACK}"
-	if use ifc; then
-		FFLAGS="${IFCFLAGS}"
+	if [[ ${FORTRANC} = if* ]]; then
 		NOOPT="-O0" # Do NOT change this. It is applied to two files with
 					# routines to determine machine constants.
 	else
@@ -163,7 +140,7 @@ src_compile() {
 	fi
 	einfo "Fortran library is ${FORTRANLIB}"
 
-	if use ifc; then
+	if [[ ${FORTRANC} = if* ]]; then
 		${FORTRANC} ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
 			-o liblapack.so.0.0.0 -lblas -lcblas -latlas \
 			-L$(gcc-config -L) ${FORTRANLIB} \
@@ -181,7 +158,7 @@ src_install () {
 	dodir "${RPATH}"
 
 	cd "${S_LAPACK}"/SRC
-	if use ifc; then
+	if [[ ${FORTRANC} = if* ]]; then
 		strip --strip-unneeded liblapack.so.0.0.0 || die
 		strip --strip-debug liblapack.a || die