Bump

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64

4 files changed, 182 insertions, 12 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index fedb3a4b3472..827e99f02213 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.240 2014/08/28 06:10:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.241 2014/10/19 10:26:34 patrick Exp $
+
+*numpy-1.9.0 (19 Oct 2014)
+
+  19 Oct 2014; Patrick Lauer <patrick@gentoo.org>
+  +files/numpy-1.9.0-no-hardcode-blas.patch, +numpy-1.9.0.ebuild:
+  Bump
 
   28 Aug 2014; Ian Delaney <idella4@gentoo.org> numpy-1.8.2.ebuild:
   tidy SRC_URI
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 2cd5ac6517d3..3e182a4d0162 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,11 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX numpy-1.8.0-f2py-insecure-temporary.patch 7232 SHA256 3e10992bcb67bedb61d07c6679e66b02de4e0cde5cb7c60034a5aafdaab9f337 SHA512 509e75d3c0a0c0afcbd57545078fb3cbc3ec611429560b9f70529a9dfb36ec13a942e3cf8ae39463be36fc5bcd6aee68445559e03801cc11ccca3a69ccf556f0 WHIRLPOOL 3653cf024f8f2c67704e3ca2501553437a41103bf2b87a1c0f43e1bd4a8364ae90a6322fa59971b26dd488a62de4fccad1109ea5059fd8ac1226c7319dfa9011
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 SHA256 ad79d788189db97178b73f019a47c502bb9297ae7a1b248da878f3f91ab8af3b SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 WHIRLPOOL 38db4618b8fe505b711270b9050c56c1541c2fc3094b02ef6a45e776d56f54fd82b79ddc1b65721e0ac08949c6b9354da8c6ae0437b77e3b474ca941d44de9bb
+AUX numpy-1.9.0-no-hardcode-blas.patch 1201 SHA256 8ad1ddd7a7a5ea3c15b0a0bbd2c1a97c10bd0ef926a6c4b3f508173ac103e297 SHA512 1c97475c83f00053472483056278f82605329cb4cd66c406941e93fce9f6c3fbfb0cf763e74faf3b901ad06a7f31ecbb35e1b8a6fd8a634799a6088c1871a589 WHIRLPOOL cbc24881adc53d7c8bf4c4cac0ea813f2594450331a460b03f88caeca48fdf121f13974019a40bdd15dff9c8985615029e1933c9d25217241628846b73b13355
 DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
 DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
+DIST numpy-1.9.0.tar.gz 3962108 SHA256 2745b1d64445da3c29a34450320025c11897ae4af77475f861966e98b2cb1a0f SHA512 dc9fb453367bd429336ed7391c0923d0d3af5f8ab26ef8681bc1a9e934ac28e2c9bc30e11f1026c2ea5710a3c4e27188007ee14b194bfca6a03228fad8f3d2fd WHIRLPOOL 5111f5cbb43bd279587f858196fbe86103abde7e8d6536337af51fe4a8371d39057d9ea75ac73ab501ff5c07c5c6e7e4e62f660ca263181e2fee3e6e61718ba9
 DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15
 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
 DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68
@@ -15,12 +14,6 @@ DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c
 EBUILD numpy-1.8.0-r1.ebuild 4065 SHA256 4eaa79959b08194a35ad004af8a1b9d7f80283e785b2343f28417fe4b8f72a35 SHA512 a139d97ba12d88d6620d0f6c675f3ee3672ce8ad6ab32152c0d4b3c877549e1646088b5084bab9da8d6cc55e3b33acf91d7ca8240b8c51c239a397e854e43b4a WHIRLPOOL 4b0acb4066e81e5c772e87ac70389e5ac1b4b7a2a814602536f3c68909204727c93bd49b1dc4795525694de7154f44cccf72cc37e054fdea722e851be3e4b8e7
 EBUILD numpy-1.8.1.ebuild 3987 SHA256 4a5ba6155429bc3d9a0fef97c565d504d02ea500e07a1a7edc5f683f2867cc61 SHA512 06c2ec9109510f2196f84f00b23a23395e71c75e17258d520571af014e0db330ed23b503ae081467136064657bb0cd64583c902d8c8d5fefe1356b955d528802 WHIRLPOOL 2c080a308f438be0dc0880539dcf144b0f3e38526c2b40b42f1c7b1a6a8ef1e54841bd75a18416b3530ca2c6b644a58f4b026c35aff3c6bddf41116e7fff4a3b
 EBUILD numpy-1.8.2.ebuild 4075 SHA256 0dc561d89bc1f8fc57566dfbacb97427c5461699d77a3df6dc8fa1e49723de56 SHA512 d063ce8d8e0935b66da9fb509ef7ab2273c37bd314fb3f7a93e7de3b64b5f9d8551483eb827978c0283a2866380610a4fd60cf99dac888c9065f239846c8ddd0 WHIRLPOOL 5d501b3fc985fb2d5dbfc610c6e3c45332fcb500974eb766e0c7cf69a288e50a1cc7654e0a32bd24e2732e223e506010f2665536c671fd0e4d1813d635e32945
-MISC ChangeLog 33404 SHA256 75c757d60273a0c0eebb34afba90c52c40a9bba88523f5bda856a2cbe738b820 SHA512 642de9190c29036d9da22244ad148bb8cb52f65e930ce5a46fdef9189501ae7cc71a0129779ae74c6239e90ed0586597df96488018d47863f1b9f73287bbc263 WHIRLPOOL 226a886e32eb803bbacbb39539a7dad13e466b07f9c8e0ca463096df500b7ca7561ce5274df805dd2c436dd64b2c7c5135b4497febcf62bec2f3461716614447
+EBUILD numpy-1.9.0.ebuild 4095 SHA256 861cd76de3bcb4f6d0b57e33a70c86141015e760f8aa515ef84b62b883cb1947 SHA512 e554428287c726b1470081ce6d12f770141dc97469b1a40cfd972f4454d2683d9a4ee92a7ef98bc4dac2e2369820a33b50a513074728faac46f309620f109b52 WHIRLPOOL 1a24e5a4a06393b969369f12dc7b797ca8b329a4499838517baae1472f7cf5b663eb4e841aaadb66d3612617fe82f3568c5e369c5b51485737bb85c196f1464d
+MISC ChangeLog 33556 SHA256 10a9c5be9d8b95b29b65079f8ecae7b8c97fd75132a84c582db856021fb98d98 SHA512 2a28982e9c69441ddfe577ec390a065fa37bd03d911c59bec52aa9bff0d2716566860ee5226774df1a7f464751f4b0e47dc7f256ffadbe629995f3c07f0c9723 WHIRLPOOL 5eda978535db5c70581765da2983eefefdbf744384b92b0fd85fafcbd2195518091323917a7ad534d702f73cadf6ed11d4b9c43f8559b8d233a3a209a2b00a53
 MISC metadata.xml 690 SHA256 9c315188497956a9b1e2a1373f7830f702cf9b588aabc33a3f5547ab75b20a84 SHA512 1adcf955fdc7f06b56a69c6345b79a4fb0ca0df17cfdcd1f3604a234389534f8f00b88ebddb3e47a39d563d7374d40349c3e4050799a31405446a1629f8c7698 WHIRLPOOL e2b34ab0b391c99a279dd11de292aafd9225f9743ec3bafafd980edb7522e772cde461705d5394569aa8dd73e72a210560eb50a23b2334ab5c12ec064099abd1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlP+xc8ACgkQso7CE7gHKw1wbwCfTwMMwqBgXYIH7kfX6mQEbHhg
-LJQAnjzyffKJ3w38z5ILW6ygIV5YsMkQ
-=vP4/
------END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch
new file mode 100644
index 000000000000..63a3be88cfc9
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch
@@ -0,0 +1,25 @@
+--- numpy/distutils/system_info.py      2014-09-07 08:57:47.000000000 +0000
++++ numpy/distutils/system_info.py.new  2014-10-19 17:57:12.099448481 +0000
+@@ -296,20 +296,7 @@
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+
diff --git a/dev-python/numpy/numpy-1.9.0.ebuild b/dev-python/numpy/numpy-1.9.0.ebuild
new file mode 100644
index 000000000000..a6473602d27a
--- /dev/null
+++ b/dev-python/numpy/numpy-1.9.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.9.0.ebuild,v 1.1 2014/10/19 10:26:34 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="1.8.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# 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
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	# absent in 1.9
+	#docinto f2py
+	#dodoc numpy/f2py/docs/*.txt
+	#doman numpy/f2py/f2py.1
+}