Version bump numpy to 1.5.0 (bug 335602).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 146 insertions, 2 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 0cd1dece4ad0..b13d6cb81b2b 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.115 2010/07/25 17:06:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.116 2010/09/02 13:25:02 djc Exp $
+
+*numpy-1.5.0 (02 Sep 2010)
+
+  02 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> +numpy-1.5.0.ebuild:
+  Version bump to 1.5.0 (bug 335602).
 
   25 Jul 2010; Raúl Porcel <armin76@gentoo.org> numpy-1.4.1.ebuild:
   ia64/s390/sh/sparc stable wrt #326251
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 835ce5b552f5..3f0d6d034ba2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -11,9 +11,11 @@ DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 S
 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.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6 SHA1 ec6078aa09acbcca3d90f9f36353fc83e7e1daa0 SHA256 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06
+DIST numpy-1.5.0.tar.gz 2276377 RMD160 6c6a8ce32d32705b66966c7a58359a0f2f404549 SHA1 5e3c40e1dde20bd8fda7a2131cb1259af7689295 SHA256 06d2181c884c5937c7c475103dd55de4fe4842a9d91bab1ed0965dd973a4661a
 EBUILD numpy-1.2.1.ebuild 4240 RMD160 749cdd64719a84cef6c2885009edd25664fbeeab SHA1 67c6a066ae5d97c394b904aa04e09eec36e41483 SHA256 81dfa92b729856475cc7dc8a29c6f8c1154e309b783f2543f48c61f6911a58b7
 EBUILD numpy-1.3.0-r1.ebuild 4342 RMD160 879a352a8de2b08c574a65263397c994550ce98a SHA1 0c18d544b1cc67a99fc2ca8ed0b2611d0aa07b69 SHA256 f913bfe4f6e75b0e07d89d3a5428f7aa96a9aee41a9cfc684b34aa1bb77cc979
 EBUILD numpy-1.3.0-r2.ebuild 4871 RMD160 95857c55408844db31856efc0ed9dd76aa79d834 SHA1 7dfa21315306a13cfa2184a419d46034fea7ed2f SHA256 8fee38f0222015c2a9ec98c7dbf6dda4679553284ebce6b11575e9d0d47e238f
 EBUILD numpy-1.4.1.ebuild 4619 RMD160 c056baa71d237c299785fd8a547ef9a1220e3d14 SHA1 50a88d00b13231cdb4506e6eb36297bd03964891 SHA256 afba66d922a6918eb84f840e94bea77498f5c1492709c77e840d445a95cdcabf
-MISC ChangeLog 16596 RMD160 cd4270630743ef857fcda13178006b4b5f6a17de SHA1 562dd53df63f493672b68b8f08bec4ecbd5d76c4 SHA256 c295c4761dbeaf4b232608124f167d26e45b757f0fecb298c2d514c9793c2e41
+EBUILD numpy-1.5.0.ebuild 4623 RMD160 75f44412f06549fb014cdea30a070a42cc4dc332 SHA1 31e05cf081da6c7e857e0fcdd0e372955c2d6a3b SHA256 aa56a999fda21c671601dc0b64d29e27eadd6061e45d5694199b6f98dc8e7fa4
+MISC ChangeLog 16728 RMD160 a499dd3c2ca6a5b023e271939c33e856760041cd SHA1 7c761922bb591625e8ab7f84e61da822ce91532d SHA256 596786776304ce5446731ef31337b83d2f69f3f4e380cbb3b54b75a6767cab16
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
diff --git a/dev-python/numpy/numpy-1.5.0.ebuild b/dev-python/numpy/numpy-1.5.0.ebuild
new file mode 100644
index 000000000000..751eabf345f6
--- /dev/null
+++ b/dev-python/numpy/numpy-1.5.0.ebuild
@@ -0,0 +1,137 @@
+# 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.5.0.ebuild,v 1.1 2010/09/02 13:25:02 djc Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator
+
+NP="${PN}-1.3"
+
+DESCRIPTION="Fast array and numerical python library"
+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 )
+	doc? ( app-arch/unzip )"
+
+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
+	use lapack || return
+	[[ -z ${FC} ]] && FC=$(tc-getFC)
+	# when fortran flags are set, pic is removed.
+	FFLAGS="${FFLAGS} -fPIC"
+	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() {
+	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
+	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
+
+	# 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
+		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'):${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 \
+				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			[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 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'):${libdir}
+			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
+
+	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
+}
+
+src_compile() {
+	distutils_src_compile ${NUMPY_FCONFIG}
+}
+
+src_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 "${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
+}