Version bump. New test framework dependent on dev-python/nose.

  Re-added gentoo names for ATLAS libraries. Dropped alpha hppa mips ppc
  ppc64 x86-fbsd until nose is keyworded.
Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 156 insertions, 17 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b74d9f32ddb5..fb4cf5faaea0 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.63 2008/09/25 09:54:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.64 2008/09/26 20:05:51 bicatali Exp $
+
+*numpy-1.2.0 (26 Sep 2008)
+
+  26 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.2.0.ebuild:
+  Version bump. New test framework dependent on dev-python/nose. Re-added
+  gentoo names for ATLAS libraries. Dropped alpha hppa mips ppc ppc64
+  x86-fbsd until nose is keyworded.
 
   25 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -numpy-1.1.0.ebuild,
   numpy-1.1.1.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a417e9729c96..7c443968f1b6 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -7,14 +7,16 @@ AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d
 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.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17 SHA1 a2755f38ca6aa799b504c84f58b03cd6ce66bc41 SHA256 d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
+DIST numpy-1.2.0.tar.gz 1425633 RMD160 614a0cb92eed89698e2cc94447d0514ad07976b5 SHA1 70c0432ad9a6bb1006158f9aac2d1cfe5ac885c2 SHA256 13cfa68706a698dd8497755fe2154f406399a6a6d9828a253b3c767c04806d55
 EBUILD numpy-1.0.4-r2.ebuild 3513 RMD160 5c08ca6bc74d5e23d4371e30397b07e8edf4bb7b SHA1 2e6762776bbd748eded9be93066f1db6dfe9d0d3 SHA256 f5ac672a2275d826bc5c2e117c79cc739299e65023955aa9a8b04e8a7368c45a
 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
+EBUILD numpy-1.2.0.ebuild 3658 RMD160 4e84a0fa1a3ee2f968fcec2c1dc9fce38ec9caf5 SHA1 0bc8c883ed88d6e43ea932cc9003fd1586620f07 SHA256 16fda828f99d50b88dab1e9eccbd9c6d766f561a7c3f12ab803843a20e29c53d
+MISC ChangeLog 9879 RMD160 4b14be0245264fdadd6106cea1812f16f342c470 SHA1 aa229ae22a7c55635cc135febc432ee8c799d989 SHA256 0186014950e085cda7227c8c56f32748a72e98f2e8256bb833ed68119242df11
+MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjbX90ACgkQ1ycZbhPLE2D4OwCfceono23Hefj1sgdfSzZOlMzI
-+v8AnRqH5DkFXxWOFipIhWm+NPegd2/M
-=nULd
+iEYEARECAAYFAkjdQKgACgkQ1ycZbhPLE2BcPwCeIGqCQFEfA+WZTEohdvThWkF2
+EewAoI3qY5o2IAK6fmTqQ507UL9IxpDK
+=o7Gi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml
index 6af77d7385de..050cbe6fc61b 100644
--- a/dev-python/numpy/metadata.xml
+++ b/dev-python/numpy/metadata.xml
@@ -3,16 +3,12 @@
 <pkgmetadata>
 <herd>sci</herd>
 <herd>python</herd>
-<longdescription>
-NumPy is a general-purpose array-processing package designed to
-efficiently manipulate large multi-dimensional arrays of arbitrary
-records without sacrificing too much speed for small multi-dimensional
-arrays.  NumPy is built on the Numeric code base and adds features
-introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type.
-
-There are also basic facilities for discrete fourier transform,
-basic linear algebra and random number generation.
-It is the successor of Numeric and numarray.
+<longdescription lang="en">
+  NumPy is a general-purpose array-processing Python package designed to
+  efficiently manipulate large multi-dimensional arrays of arbitrary
+  records without sacrificing too much speed for small multi-dimensional
+  arrays. There are also basic facilities for discrete fourier transform,
+  basic linear algebra and random number generation.
+  It is the successor of Numeric and numarray.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-python/numpy/numpy-1.2.0.ebuild b/dev-python/numpy/numpy-1.2.0.ebuild
new file mode 100644
index 000000000000..782688d9136e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.2.0.ebuild
@@ -0,0 +1,134 @@
+# 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.2.0.ebuild,v 1.1 2008/09/26 20:05:51 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}
+	test? ( >=dev-python/nose-0.10 )
+	lapack? ( dev-util/pkgconfig )"
+
+IUSE="lapack test"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+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} --noopt --noarch"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix some paths and docs in f2py
+	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
+
+	# Gentoo patch for ATLAS library names
+	sed -i \
+		-e "s:'f77blas':'blas':g" \
+		-e "s:'ptf77blas':'blas':g" \
+		-e "s:'ptcblas':'cblas':g" \
+		-e "s:'lapack_atlas':'lapack':g" \
+		numpy/distutils/system_info.py \
+		|| die "sed system_info.py failed"
+
+	if use lapack; then
+		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[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 \
+				| sed -e 's/^-L//' -e 's/ -L/:/g')
+			libraries = $(pkg-config --libs-only-l cblas \
+				| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			[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
+		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*
+	PYTHONPATH=python "${python}" -c "import numpy; numpy.test()" 2>&1 | tee test.log
+	grep -q '^ERROR' test.log && die "test failed"
+	popd
+	rm -rf test
+}
+
+src_install() {
+	distutils_src_install ${NUMPY_FCONFIG}
+	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
+	rm -f "${D}"/usr/lib/python*/site-packages/numpy/*.txt
+	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
+}