Drop pkg_setup() and use default fortran one. This gets rid of the forced ATLAS use and blas/lapack-config checks added in #129524. It seems to work OK with other implems as long as you're consistent about it, and it breaks in an annoying way with newer eselect modules (see #136023 e.g.). Also this drops the LDFLAGS stuff that was wrongly added, a better fix is already in here.

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 22 insertions, 53 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index b107c08f650e..91b258cb7c64 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.12 2006/09/24 07:31:47 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.13 2006/09/24 07:38:30 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; scipy-0.5.1.ebuild:
+  Drop pkg_setup() and use default fortran one. This gets rid of the forced
+  ATLAS use and blas/lapack-config checks added in #129524. It seems to work
+  OK with other implems as long as you're consistent about it, and it breaks
+  in an annoying way with newer eselect modules (see #136023 e.g.). Also this
+  drops the LDFLAGS stuff that was wrongly added, a better fix is already in
+  here.
 
   24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; scipy-0.4.8.ebuild,
   scipy-0.4.8-r1.ebuild, scipy-0.4.9.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 576a43f26dca..fa829451c731 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -22,14 +22,14 @@ EBUILD scipy-0.4.9.ebuild 3497 RMD160 13f6aaa31e2854bf2e741a4ad962547fec858421 S
 MD5 0c39cf027eaa3cdeea4ea25df05859d5 scipy-0.4.9.ebuild 3497
 RMD160 13f6aaa31e2854bf2e741a4ad962547fec858421 scipy-0.4.9.ebuild 3497
 SHA256 615c959bc05c5af88f9ef256c1cce26f47be55d92c3203c92f12a5c070788d59 scipy-0.4.9.ebuild 3497
-EBUILD scipy-0.5.1.ebuild 3567 RMD160 8a5323e7ec1d1673214fc6a466793825c375986c SHA1 08b4366d5131b667960ad2e3c157bc9991b66e7a SHA256 667cf11bf97e9fa3747a9b363bb2518d5e496313f5003c08b0d4881c6e8f441b
-MD5 edfcd340eccdbbd888969bac55397818 scipy-0.5.1.ebuild 3567
-RMD160 8a5323e7ec1d1673214fc6a466793825c375986c scipy-0.5.1.ebuild 3567
-SHA256 667cf11bf97e9fa3747a9b363bb2518d5e496313f5003c08b0d4881c6e8f441b scipy-0.5.1.ebuild 3567
-MISC ChangeLog 2236 RMD160 99bb1f815b5ce0bc0225c38f9b0469d7e39fd495 SHA1 fa3aca375bbe42763a5adb78dda312a8b9a19c19 SHA256 8d59259d94cadf724510b55d12693e734da6fc4fe760c5725ec39f3442295997
-MD5 f07d4fb6258090bb01f5f0f136e91bd2 ChangeLog 2236
-RMD160 99bb1f815b5ce0bc0225c38f9b0469d7e39fd495 ChangeLog 2236
-SHA256 8d59259d94cadf724510b55d12693e734da6fc4fe760c5725ec39f3442295997 ChangeLog 2236
+EBUILD scipy-0.5.1.ebuild 2215 RMD160 a5d5f4d21ae75f72356e2d189af96db55bdb7054 SHA1 f663cf57117d13aca60913fbe1c1df3b56ff9978 SHA256 2a3b515d49be54bdfd59a80d3730946e380078635f978589ac5d8a02d1e3d14c
+MD5 db14ccd0f666cb1e50c1de51e3fdc080 scipy-0.5.1.ebuild 2215
+RMD160 a5d5f4d21ae75f72356e2d189af96db55bdb7054 scipy-0.5.1.ebuild 2215
+SHA256 2a3b515d49be54bdfd59a80d3730946e380078635f978589ac5d8a02d1e3d14c scipy-0.5.1.ebuild 2215
+MISC ChangeLog 2705 RMD160 4cb0fa4df84dd5bbe11d94e11b65521833e450d8 SHA1 4a762df483e61f7fe4ef0113e1e0eb86858fad67 SHA256 4f10385a7424e545fd7c86350ba5445ad6feca177434e7d531679e91140a3e5b
+MD5 a6b0e94f0bb9fd0375a0764158efa987 ChangeLog 2705
+RMD160 4cb0fa4df84dd5bbe11d94e11b65521833e450d8 ChangeLog 2705
+SHA256 4f10385a7424e545fd7c86350ba5445ad6feca177434e7d531679e91140a3e5b ChangeLog 2705
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/scipy/scipy-0.5.1.ebuild b/sci-libs/scipy/scipy-0.5.1.ebuild
index ff540df708fb..79d471c2060a 100644
--- a/sci-libs/scipy/scipy-0.5.1.ebuild
+++ b/sci-libs/scipy/scipy-0.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.5.1.ebuild,v 1.1 2006/09/24 07:29:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.5.1.ebuild,v 1.2 2006/09/24 07:38:30 dberkholz Exp $
 
-inherit distutils flag-o-matic fortran
+inherit distutils fortran
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 DESCRIPTION="Open source scientific tools for Python"
@@ -13,14 +13,11 @@ SLOT="0"
 IUSE="fftw"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-# did not use virtual/blas and virtual/lapack
-# because doc says scipy needs to compile all libraries with the same compiler
+# doc says scipy needs to compile all libraries with the same compiler
 RDEPEND=">=dev-lang/python-2.3.3
 	>=dev-python/numpy-1.0_beta1
-	sci-libs/blas-atlas
-	sci-libs/blas-config
-	sci-libs/lapack-config
-	sci-libs/lapack-atlas
+	virtual/blas
+	virtual/lapack
 	fftw? ( =sci-libs/fftw-2.1* )"
 
 DEPEND="${RDEPEND}"
@@ -31,42 +28,6 @@ DEPEND="${RDEPEND}"
 
 FORTRAN="g77 gfortran"
 
-pkg_setup() {
-	fortran_pkg_setup
-
-	einfo "Checking active BLAS implementations for ATLAS."
-	blas-config -p
-	if ! blas-config -p | grep "F77 BLAS:" | grep -q -i atlas; then
-		eerror "Your F77 BLAS profile is not set to the ATLAS implementation,"
-		eerror "which is required by ${PN} to compile and run properly."
-		eerror "Use: 'blas-config -f ATLAS' to activate ATLAS."
-		echo
-		bad_profile=1
-	fi
-	if ! blas-config -p | grep "C BLAS:" | grep -q -i atlas; then
-		eerror "Your C BLAS profile is not set to the ATLAS implementation,"
-		eerror "Which is required by ${PN} to compile and run properly."
-		eerror "Use: 'blas-config -c ATLAS' to activate ATLAS."
-		echo
-		bad_profile=1
-	fi
-	einfo "Checking active LAPACK implementation for ATLAS."
-	lapack-config -p
-	if ! lapack-config -p | grep "F77 LAPACK:" | grep -q -i atlas; then
-		eerror "Your F77 LAPACK profile is not set to the ATLAS implementation,"
-		eerror "which is required by ${PN} to compile and run properly."
-		eerror "Use: 'lapack-config ATLAS' to activate ATLAS."
-		bad_profile=1
-	fi
-	if ! [ -z ${bad_profile} ]; then
-		die "Active BLAS/LAPACK implementations are not ATLAS."
-	fi
-
-	# -Wl,-O1 breaks the compilation
-	filter-ldflags -O1
-	filter-ldflags -Wl,-O1
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"