Version bump and added more configuration for better multiple lapack implementations

Package-Manager: portage-2.1.4.4

5 files changed, 196 insertions, 35 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 58b705cd90bd..a6801f2e992a 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.60 2008/05/20 13:52:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.61 2008/06/22 11:13:01 bicatali Exp $
+
+*numpy-1.1.0 (22 Jun 2008)
+
+  22 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numpy-1.1.0-f2py.patch, numpy-1.0.4-r2.ebuild, +numpy-1.1.0.ebuild:
+  Version bump and added more configuration for better multiple lapack
+  implementations
 
   20 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/numpy-1.0.4-cpuinfo.patch, -files/numpy-1.0.4-nocona-cpuinfo.patch,
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 279182176fcb..e811191231ca 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -4,14 +4,17 @@ Hash: SHA1
 AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
 AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5aad SHA1 e05ed0360a1ac3a980d5b85c536819827c5ca7b7 SHA256 c217b30365c9134482949a5e4a8fdac0577b3205c2d46f30a327323fef5bd1c7
 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
-EBUILD numpy-1.0.4-r2.ebuild 3596 RMD160 b7448b4e2dcb6aff05fa8997ded423b340acee61 SHA1 19d161ba08eab0c9f903001ae65d5cedd55ac6cc SHA256 6e0e94151ffb47cbee08032f917611970bb0fa6bb3cff164bbaa354db3ac1e36
-MISC ChangeLog 9049 RMD160 31f8ee1637d05b2c51b0e41e39d6032d5b849275 SHA1 e4cdf22d6ec6531536abdcd5bb4a5f064812f8a4 SHA256 564f1ab9d4e3fda8a37641f9f2a47d6ae4dc488f9a7cbd2dabe0ef3f9b710980
+DIST numpy-1.1.0.tar.gz 1733403 RMD160 046d15df1d4c1733886a61677d6f7e9a836f8ea3 SHA1 c36451e05251599294abfefa386835300e2066d5 SHA256 9e21faf738f6921a3c6a5e3a393b8d24eb7f2fdc51570eb9184e5119d9664e6d
+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
+MISC ChangeLog 9299 RMD160 b45b2ddd990f3a916f66af37a2aa6b15b4ce44ce SHA1 eb831c31a500dc52ddc4e34b01a6dfeece79d087 SHA256 7d27ae9600f1c0eaf6c49b970b15eadc7b0be7ff59ec3fbbdc9f0fa8426e5973
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgy2GUACgkQ1ycZbhPLE2CByQCfXdXDLLRbWCELcUkA93OEUOyN
-r+4AnRsGqRw69mNmOo9BDyEKaT/nXk2r
-=xkRS
+iEYEARECAAYFAkheM9UACgkQ1ycZbhPLE2C8LQCfeW7AdB9spb+RfX+qmogO8vlD
+z0UAn2Jr+cLbgslOjVg0N+1pyw+eTdUT
+=qAzW
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.1.0-f2py.patch b/dev-python/numpy/files/numpy-1.1.0-f2py.patch
new file mode 100644
index 000000000000..1ec18a937f82
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.1.0-f2py.patch
@@ -0,0 +1,36 @@
+diff -Nur numpy/f2py/f2py.1 numpy/f2py.new/f2py.1
+--- numpy/f2py/f2py.1	2006-07-26 21:04:19.000000000 +0100
++++ numpy/f2py.new/f2py.1	2007-02-14 12:16:47.000000000 +0000
+@@ -184,7 +184,7 @@
+ 
+ Optional Numarray 0.9 or higher partially supported.
+ 
+-numpy_distutils from Scipy (can be downloaded from F2PY homepage)
++numpy_distutils from Numpy (can be downloaded from F2PY homepage)
+ .SH "SEE ALSO"
+ python(1)
+ .SH BUGS
+@@ -200,10 +200,8 @@
+ 
+ Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
+ 
+-Scipy website: http://www.numpy.org
++Numpy website: http://numeric.numpy.org
+ .SH COPYRIGHT
+ Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
+ .SH LICENSE
+ NumPy License
+-.SH VERSION
+-2.45.241
+diff -Nur numpy/f2py/setup.py numpy/f2py.new/setup.py
+--- numpy/f2py/setup.py	2006-10-03 05:35:22.000000000 +0100
++++ numpy/f2py.new/setup.py	2007-02-14 12:16:41.000000000 +0000
+@@ -35,8 +35,7 @@
+ 
+     config.add_data_files('src/fortranobject.c',
+                           'src/fortranobject.h',
+-                          'f2py.1'
+                           )
+ 
+     config.make_svn_version_py()
+ 
diff --git a/dev-python/numpy/numpy-1.0.4-r2.ebuild b/dev-python/numpy/numpy-1.0.4-r2.ebuild
index c6e865db2587..e538845a3ed4 100644
--- a/dev-python/numpy/numpy-1.0.4-r2.ebuild
+++ b/dev-python/numpy/numpy-1.0.4-r2.ebuild
@@ -1,16 +1,13 @@
 # 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.0.4-r2.ebuild,v 1.10 2008/05/20 13:52:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild,v 1.11 2008/06/22 11:13:01 bicatali Exp $
 
 NEED_PYTHON=2.3
 
 inherit distutils eutils flag-o-matic fortran
 
-MY_P=${P/_beta/b}
-MY_P=${MY_P/_}
-
 DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
 HOMEPAGE="http://numeric.scipy.org/"
 
 RDEPEND="!dev-python/f2py
@@ -24,8 +21,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 LICENSE="BSD"
 
-S="${WORKDIR}/${MY_P}"
-
 # whatever LDFLAGS set will break linking
 # see progress in http://projects.scipy.org/scipy/numpy/ticket/573
 if [ -n "${LDFLAGS}" ]; then
@@ -76,29 +71,20 @@ src_unpack() {
 	# Detect phenom and nocona hardware correctly.  Bug #183236.
 	epatch "${FILESDIR}"/${P}-cpuinfo.patch
 
-	# Gentoo patch for ATLAS library and include dirs
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		-e "s:'atlas\*',:'','atlas\*',:g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-	EOF
-
 	if use lapack; then
+		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
 		# cblas and lapack libraries under the name of atlas
-		# otherwise scipy will not create fast _dotblas
+		# otherwise fast _dotblas is not built
 		cat >> site.cfg <<-EOF
 			[atlas]
-			atlas_libs = $(pkg-config --libs-only-l cblas lapack \
-				| sed -e 's/^-l//' -e 's/ -l/,/g')
+			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
@@ -137,9 +123,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! built_with_use sys-devel/gcc fortran && ! has_version dev-lang/ifc; then
+	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-emerge gcc,"
-		ewarn "or emerge dev-lang/ifc"
+		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.0.ebuild b/dev-python/numpy/numpy-1.1.0.ebuild
new file mode 100644
index 000000000000..5b5d852e4cbb
--- /dev/null
+++ b/dev-python/numpy/numpy-1.1.0.ebuild
@@ -0,0 +1,127 @@
+# 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
+}