Version bump. Removed most architecture specific patches, applied upstream. Fixed the site.cfg generation such that dotblas.so links with atlas when present (was broken with the introduction of EPREFIX)

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 82 insertions, 46 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 05425d347fad..6344aec1a5de 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/numpy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.103 2009/11/20 20:03:39 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.104 2010/01/04 17:50:26 bicatali Exp $
+
+*numpy-1.4.0 (04 Jan 2010)
+
+  04 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> -numpy-1.3.0.ebuild,
+  +numpy-1.4.0.ebuild:
+  Version bump. Removed most architecture specific patches, applied
+  upstream. Fixed the site.cfg generation such that dotblas.so links with
+  atlas when present (was broken with the introduction of EPREFIX)
 
   20 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
   numpy-1.3.0-r2.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 82dfe734895f..695b9fc5d9af 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
 AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
@@ -9,9 +12,17 @@ DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119
 DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
 DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
 DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
+DIST numpy-1.4.0.tar.gz 2215411 RMD160 313502001e1d30e8b218b5b02f6a1d8387407f3c SHA1 522b789527f280410ab09f10c947ccc3f8086a8f SHA256 b8dbdb2c8459699b4021b72237222e4b7314d0bacecce5951a6a1318de32270d
 EBUILD numpy-1.2.1.ebuild 4237 RMD160 523240c56efc80b8fdc32a7a0356d7bbb7d02059 SHA1 531b4656bfd3077d761c0e5074bf19cc033067cd SHA256 18d23bb2e7a8d9cc8c24e039a00b8004773f492af7ce6cd070bc6d1acdb28bc7
 EBUILD numpy-1.3.0-r1.ebuild 4342 RMD160 39539db526765f240f2d613a1404fcb1339520e7 SHA1 fe2338cf12b297e30048c67306282dfbe1925317 SHA256 47f17d3a2239e0e786c523c001b09df34aa0f2a681e54515a77ffac91013b749
 EBUILD numpy-1.3.0-r2.ebuild 4853 RMD160 93add86217a2d1d6aff15b3ce410aae8d1a34615 SHA1 45f67dd9439b4544db707750091ad45c254a106c SHA256 dfeba721ab9b7433c2c532d00473c989fb9bc5839f69bc20cbf1a8d8135f6105
-EBUILD numpy-1.3.0.ebuild 3730 RMD160 c0d829ee7118786377feafc13bee29fd87607bce SHA1 74b47ee040e480a28e37ff3c14fa4f4ffc08f95e SHA256 03726529570ea97cc39867718c5f24e5d020425628eaa7a15210318b19fbfe09
-MISC ChangeLog 14626 RMD160 ced32a379c44fcd67e4109158fc293239f21c848 SHA1 f956f706aa05e3a0c8245193e57c53250f7ac86f SHA256 d80fde665b2be0830ea9dca6023f5c70178d357ac11f914ea7a6745b63b3bdb4
+EBUILD numpy-1.4.0.ebuild 4561 RMD160 6d15f387f48f060c263c74b620cb096f19cb0b6d SHA1 2ce3aabeab364202cd76c26e3980393cc38c452d SHA256 f8a0072d0a550a6aa87fb8560e6f4c3e602a9fd932521fc747ac2f94a19ee634
+MISC ChangeLog 14963 RMD160 c85f3cf5257302427c5cf4fdc39c39eaf6b2188f SHA1 308da105611b7729480e09b8abb25ae3e5e1f23e SHA256 ecd19bb0721d006e3bf23f8a96fd4dbae51c2d55286b97342e4be62311cdd95c
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktCMyYACgkQ1ycZbhPLE2AuFgCcDMO9ouFq8i8CVefIzkoH07Um
+obQAnRtG+nuxKm5fmlBVhM+9LpHACWRk
+=lJcP
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.3.0.ebuild b/dev-python/numpy/numpy-1.4.0.ebuild
index 7c7d26c7cdeb..f6c374892b95 100644
--- a/dev-python/numpy/numpy-1.3.0.ebuild
+++ b/dev-python/numpy/numpy-1.4.0.ebuild
@@ -1,35 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.12 2009/08/29 19:07:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.4.0.ebuild,v 1.1 2010/01/04 17:50:26 bicatali Exp $
 
-NEED_PYTHON=2.4
-EAPI=2
-inherit eutils distutils flag-o-matic toolchain-funcs
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator
+
+NP="${PN}-1.3"
 
 DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://numpy.scipy.org/"
+HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
+		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
+		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
 
 RDEPEND="dev-python/setuptools
 	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )"
-
-IUSE="lapack test"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh 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
+	test? ( >=dev-python/nose-0.10 )
+	doc? ( app-arch/unzip )"
+RESTRICT_PYTHON_ABIS="3.*"
 
 pkg_setup() {
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		append-ldflags -shared
+	fi
+
 	# only one fortran to link with:
 	# linking with cblas and lapack library will force
 	# autodetecting and linking to all available fortran compilers
@@ -40,13 +49,16 @@ pkg_setup() {
 	export NUMPY_FCONFIG="config_fc --noopt --noarch"
 }
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
+	fi
+}
+
 src_prepare() {
-	# Fix some paths and docs in f2py
 	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-
-	epatch "${FILESDIR}/${P}-parisc.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-alpha.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-arm-sh.patch"
+	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
 
 	# Gentoo patch for ATLAS library names
 	sed -i \
@@ -60,13 +72,13 @@ src_prepare() {
 	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
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		cat >> site.cfg <<-EOF
 			[atlas]
 			include_dirs = $(pkg-config --cflags-only-I \
 				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
 			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas lapack | sed -e \
-				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
+				cblas blas lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
 			atlas_libs = $(pkg-config --libs-only-l \
 				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 			lapack_libs = $(pkg-config --libs-only-l \
@@ -75,14 +87,12 @@ src_prepare() {
 			include_dirs = $(pkg-config --cflags-only-I \
 				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
 			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):/usr/$(get_libdir)
+				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
 			libraries = $(pkg-config --libs-only-l \
 				cblas blas | 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' \
-				-e 's/ //g'):/usr/$(get_libdir)
+				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
 			libraries = $(pkg-config --libs-only-l \
 				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		EOF
@@ -96,22 +106,29 @@ src_compile() {
 }
 
 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
+	testing() {
+		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
+			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
+		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
+		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
+		grep -q '^ERROR' test.log && die "test failed"
+		popd > /dev/null
+		rm -fr test-${PYTHON_ABI}
+	}
+	python_execute_function testing
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	distutils_src_install ${NUMPY_FCONFIG}
 	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${D}"/usr/lib/python*/site-packages/numpy/*.txt || die
+	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
 	docinto f2py
 	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
 	doman numpy/f2py/f2py.1 || die "doman failed"
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html || die
+		doins  "${DISTDIR}"/${NP}*pdf || die
+	fi
 }