One more fix for removal automagic blas/lapack detection, see bug #237739

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 20 insertions, 144 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 1e6e1f2cd78d..b74d9f32ddb5 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.62 2008/08/21 16:27:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.63 2008/09/25 09:54:21 bicatali Exp $
+
+  25 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -numpy-1.1.0.ebuild,
+  numpy-1.1.1.ebuild:
+  One more fix for removal automagic blas/lapack detection, see bug #237739
 
 *numpy-1.1.1 (21 Aug 2008)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7e868a4d2140..a417e9729c96 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,17 +6,15 @@ AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5a
 AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 SHA1 719621772bbb7f4016396081cac1742d15050c01 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
-DIST numpy-1.1.0.tar.gz 1733403 RMD160 046d15df1d4c1733886a61677d6f7e9a836f8ea3 SHA1 c36451e05251599294abfefa386835300e2066d5 SHA256 9e21faf738f6921a3c6a5e3a393b8d24eb7f2fdc51570eb9184e5119d9664e6d
 DIST numpy-1.1.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17 SHA1 a2755f38ca6aa799b504c84f58b03cd6ce66bc41 SHA256 d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
 EBUILD numpy-1.0.4-r2.ebuild 3513 RMD160 5c08ca6bc74d5e23d4371e30397b07e8edf4bb7b SHA1 2e6762776bbd748eded9be93066f1db6dfe9d0d3 SHA256 f5ac672a2275d826bc5c2e117c79cc739299e65023955aa9a8b04e8a7368c45a
-EBUILD numpy-1.1.0.ebuild 3288 RMD160 0a7648e770f284b020b38b4cf75cd0280488739c SHA1 e3a46c2d1214edfe9adedf0c02764d03cc77ca69 SHA256 e7a505798876233ffe5d1348b508a87a3bcd8ebaaa6c8c18395387a6a1baf83e
-EBUILD numpy-1.1.1.ebuild 3295 RMD160 3abb513c0ecee4a2a4615342330dd169b1a44b92 SHA1 5ea1ff864b2771ddaf6a6aa4869d1f7f4d6cb6a8 SHA256 f44e50070572ea74e27c918fcfc6ded745c43f7140d4d22ffd398089a7b5fe44
-MISC ChangeLog 9419 RMD160 e68ac35231c28ad304125888880b244db9c9fc41 SHA1 6182f741b75f764e5520e5fe135de8b401f81a40 SHA256 33491f197f8cbb2a88568d35acbb232960f313565e5922c6788c4c03854b4e10
+EBUILD numpy-1.1.1.ebuild 3354 RMD160 f85bbed92966a39bac53c17af1401d1375d92727 SHA1 ed3cca163f989afa90cd619bc11fb2c118f5a04a SHA256 374eee70f651b6ee2714493b12d8581f85766b654d1b333f52be5e8755e0ac48
+MISC ChangeLog 9594 RMD160 c4eede42c064dc17ea8796aa9c4f2dd32365b5de SHA1 ebe4d9e34ef884d8d7a0632d904447dada803bb1 SHA256 ddcb315dd4d2ba220e98ba455b0b04c8e2a0428d2b24550839ee5741018f040c
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkitmHYACgkQ1ycZbhPLE2AZogCfXNt1HPgGUaeKou2Th7oNkNBX
-gpUAniladkZBdA8utcUJig5B/5YDluzs
-=iuQN
+iEYEARECAAYFAkjbX90ACgkQ1ycZbhPLE2D4OwCfceono23Hefj1sgdfSzZOlMzI
++v8AnRqH5DkFXxWOFipIhWm+NPegd2/M
+=nULd
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.1.0.ebuild b/dev-python/numpy/numpy-1.1.0.ebuild
deleted file mode 100644
index 5b5d852e4cbb..000000000000
--- a/dev-python/numpy/numpy-1.1.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.0.ebuild,v 1.1 2008/06/22 11:13:01 bicatali Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils eutils flag-o-matic fortran
-
-DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://numeric.scipy.org/"
-
-RDEPEND="!dev-python/f2py
-	lapack? ( virtual/cblas virtual/lapack )"
-
-DEPEND="${RDEPEND}
-	lapack? ( dev-util/pkgconfig )"
-
-IUSE="lapack"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="BSD"
-
-# whatever LDFLAGS set will break linking
-# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
-if [ -n "${LDFLAGS}" ]; then
-	append-ldflags -shared
-else
-	LDFLAGS="-shared"
-fi
-
-pkg_setup() {
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	use lapack || return
-	FORTRAN="gfortran g77 ifc"
-	fortran_pkg_setup
-	local fc=
-	case ${FORTRANC} in
-		gfortran) fc=gnu95 ;;
-		g77) fc=gnu ;;
-		ifc|ifort)
-			if use ia64; then
-				fc=intele
-			elif use amd64; then
-				fc=intelem
-			else
-				fc=intel
-			fi
-			;;
-		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
-			die "numpy_fortran_setup failed" ;;
-	esac
-
-	# when fortran flags are set, pic is removed.
-	use amd64 && FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --fcompiler=${fc}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix some paths and docs in f2py
-	epatch "${FILESDIR}"/${P}-f2py.patch
-
-	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		# cblas and lapack libraries under the name of atlas
-		# otherwise fast _dotblas is not built
-		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I cblas lapack \
-				| sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L cblas lapack \
-				| sed -e 's/^-L//' -e 's/ -L/:/g')
-			atlas_libs = $(pkg-config --libs-only-l cblas \
-				| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l lapack \
-				| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-}
-
-src_compile() {
-	# when fortran flags are set, pic is removed but unfortunately needed
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	"${python}" setup.py ${NUMPY_FCONFIG} install \
-		--home="${S}"/test \
-		--no-compile \
-		|| die "install test failed"
-
-	pushd "${S}"/test/lib*/python
-	PYTHONPATH=. "${python}" -c "import numpy; numpy.test(10,3)" 2>&1 \
-		| tee test.log
-	grep -q '^OK$' test.log || die "test failed"
-	popd
-
-	rm -rf test
-}
-
-src_install() {
-	distutils_src_install ${NUMPY_FCONFIG}
-
-	docinto numpy
-	dodoc numpy/doc/*txt || die "dodoc failed"
-
-	docinto f2py
-	dodoc numpy/f2py/docs/*txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	if  ! built_with_use sys-devel/gcc fortran &&
-		! has_version dev-lang/ifc
-	then
-		ewarn "To use numpy's f2py you need a fortran compiler."
-		ewarn "You can either set USE=fortran flag and re-install gcc,"
-		ewarn "or install dev-lang/ifc"
-	fi
-}
diff --git a/dev-python/numpy/numpy-1.1.1.ebuild b/dev-python/numpy/numpy-1.1.1.ebuild
index 20101bad4547..bc279273441e 100644
--- a/dev-python/numpy/numpy-1.1.1.ebuild
+++ b/dev-python/numpy/numpy-1.1.1.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/dev-python/numpy/numpy-1.1.1.ebuild,v 1.1 2008/08/21 16:27:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild,v 1.2 2008/09/25 09:54:21 bicatali Exp $
 
 NEED_PYTHON=2.4
 
@@ -64,20 +64,21 @@ src_unpack() {
 
 	# Fix some paths and docs in f2py
 	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-
 	if use lapack; then
 		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		# cblas and lapack libraries under the name of atlas
-		# otherwise fast _dotblas is not built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
 		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I cblas lapack \
+			[blas_opt]
+			include_dirs = $(pkg-config --cflags-only-I cblas \
 				| sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L cblas lapack \
+			library_dirs = $(pkg-config --libs-only-L cblas \
 				| sed -e 's/^-L//' -e 's/ -L/:/g')
-			atlas_libs = $(pkg-config --libs-only-l cblas \
+			libraries = $(pkg-config --libs-only-l cblas \
 				| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l lapack \
+			[lapack_opt]
+			library_dirs = $(pkg-config --libs-only-L lapack \
+				| sed -e 's/^-L//' -e 's/ -L/:/g')
+			libraries = $(pkg-config --libs-only-l lapack \
 				| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		EOF
 	else