bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 162 insertions, 22 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index da50f64fa579..13560a76b2fd 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.237 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.238 2014/08/22 11:09:44 idella4 Exp $
+
+*numpy-1.8.2 (22 Aug 2014)
+
+  22 Aug 2014; Ian Delaney <idella4@gentoo.org> +numpy-1.8.2.ebuild,
+  numpy-1.8.1.ebuild:
+  bump
 
   14 Aug 2014; Justin Lecher <jlec@gentoo.org> numpy-1.8.1.ebuild:
   Fix doc installation patrh, #519236; thanks ero-sennin for the patch
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index c9fbcae21091..2b4caa897b45 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 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-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
@@ -12,25 +13,14 @@ DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544
 DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335
 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a
 EBUILD numpy-1.8.0-r1.ebuild 4065 SHA256 4eaa79959b08194a35ad004af8a1b9d7f80283e785b2343f28417fe4b8f72a35 SHA512 a139d97ba12d88d6620d0f6c675f3ee3672ce8ad6ab32152c0d4b3c877549e1646088b5084bab9da8d6cc55e3b33acf91d7ca8240b8c51c239a397e854e43b4a WHIRLPOOL 4b0acb4066e81e5c772e87ac70389e5ac1b4b7a2a814602536f3c68909204727c93bd49b1dc4795525694de7154f44cccf72cc37e054fdea722e851be3e4b8e7
-EBUILD numpy-1.8.1.ebuild 3984 SHA256 daca2e40e1699a299d74b6b5ef350e1d899bfdaa4cb3eeaca92a516d1605fea9 SHA512 19e9d62fb7c03678c95eddbf19fda73c1459cb89a7d45a54ad60a28d3efdc0868fd62ac60e574232a5c08e30857007716434bd61dbd877941c2257c5ded32c91 WHIRLPOOL a727952b37e76696005ce606023b32188d68dfd68e47f83e3b106363432ec1ddf223076ad4b04895e6bdd6e6331d24cd7138e155258bd664ebc9abea3b9020bd
-MISC ChangeLog 33090 SHA256 9ecf8550084b32c3545d48bab8efa9f0b40aa07803e159b364f01db2e5559d67 SHA512 ee3989ab5af46ebae88f9061cc359a9b0f38bf7cd07b111e788f660f29b3032445eb8a2a783be06dd5e7dbaee17891decd861fb001cf767978b2376e8ac5d37b WHIRLPOOL c7e81af0748a77e610eafa6ba5d51899e41db03575ac02c29d726d0eedba1ae78e9c27276abf7ec8e51ecc5b941683648acebc5d5d80534ec5e81681c42c27e8
+EBUILD numpy-1.8.1.ebuild 3992 SHA256 0f5981a2faa150e3060c16a114b35b4c26add145eea60d8bff39c98d846232ec SHA512 1c2fe0866f856749a5ad7c599d549122cc1b258ff9c35546a17c5f3aa9c25080b91723d05f35e35b78ddb45ac8917b6ffe6f943eaec3ee77270d96799304c05e WHIRLPOOL 32bbe0c8081ef96a0e19760cd48bcf3cb575f26b660dad1de45ed18bffe347982ba96dce76f6a8ff5798e425b98944adf21330832bab58855cf7f247e2c115d5
+EBUILD numpy-1.8.2.ebuild 4050 SHA256 b3c21c90c4af916c8bdf0bc1111f080b9d36eee99367e14e30820f8a7f38df51 SHA512 e6adfd541152c4b4353d30191e808d2d7e62d2945d6a96bf8fb4b65bb482c883540c362ff5160728db96d96f807c407c1c926bb3d4e2e7d32849c4acffc8309a WHIRLPOOL 2b84cf3f201171dd77c0ba399f6db5a85036abc0e0328056d21ecf615a24a3c947cf6e2690b31c987dd1198bac8eb5967ad20a9fe0c49299e949f4333a75d7a2
+MISC ChangeLog 33220 SHA256 8325d8576e2a047eaafe7514ed640bf152a131ebae7ecfde3524a0ba64699324 SHA512 49e5c5c1a2a74a96c952317a53574de11e3904425e638c5c977c6e0d58f054db5db16a4b028f160b8d396aa015a00324f2081ea211df627c80efb9d2d075eeb6 WHIRLPOOL f9b006d31bd74ab2c8b839eab0cb67e0c6e98272aaf925645fb0b3e51987783a096491924202d2004b1cc13a2c0f86654fe8200af92f436fe17f1c748ce766c5
 MISC metadata.xml 690 SHA256 9c315188497956a9b1e2a1373f7830f702cf9b588aabc33a3f5547ab75b20a84 SHA512 1adcf955fdc7f06b56a69c6345b79a4fb0ca0df17cfdcd1f3604a234389534f8f00b88ebddb3e47a39d563d7374d40349c3e4050799a31405446a1629f8c7698 WHIRLPOOL e2b34ab0b391c99a279dd11de292aafd9225f9743ec3bafafd980edb7522e772cde461705d5394569aa8dd73e72a210560eb50a23b2334ab5c12ec064099abd1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJT7FXvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbS8P/2Z3/TIB1RqNBVnaOjyyJGRJ
-sIJUvSJdd/L43qhFWhk1EJS0li02uOhKqmsBaFboVBTfas5BVyDumhiGj0R9HFo/
-MlNIXNRLqixpE7o2TlOtSp5A8A4xVbK7ObZ/ZI4Nf2htBQkHdUcpp88yDU/lpqvS
-qFHK7VnfswRrzTyHzP18jl9D5gnZQacTo78VESjWyxpzcmA4UVP3oTHJIv7mFEJh
-ExD6geS3tdNjuS4uSU7LZM4zgSpa+5OJ5EZXq1aFQ5hgSNALznqw8X4KAzchJB5v
-r/6pCgf2fLLZTpyQNCMZvbGiKE13Rzz4OzMadnimVv8RLTbcd9fgE9vC3LgMsKtZ
-FrMS9sXgNRNbDxZtNELILYqjQt26XOyoRlNYSPTsHTin4t/5oiT+fnxY29nK8bEM
-N9jw2HKTpfGUWflV5pJKLzXsNz+dCM1ZKr0bCQpMhWNxAHbp/YXi5EwGRKsKE3Su
-h6Bmj0Gdeks95Lw04eZ3qtN1Dfwpn0jr4xsvad+lXuCwNYcBrzzvK2KCV7N/YI+J
-jGPx5pkpTVxKC3e9XDWDKrwZHtkNdJhfR518DVouYkTzmWvkgJfKv66npxp2dcNM
-5Bg0WPscHV6wDy8Flsz0OH5QPf2aTnyIzqf0Zx03e94VjYerZed6qBJwW1S5gxbj
-zfgVPZfA5T4XtjDgoEkS
-=0HJT
+iEYEAREIAAYFAlP3It0ACgkQso7CE7gHKw0DHACbBgexYZuZAhxEhRgtA/OPKhAK
+1hcAoKAtmFqOIRqTl95HQ0vMWxc078c8
+=F9e8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild
index 9759b430be2e..1d9a0274aad3 100644
--- a/dev-python/numpy/numpy-1.8.1.ebuild
+++ b/dev-python/numpy/numpy-1.8.1.ebuild
@@ -1,10 +1,10 @@
 # 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.8.1.ebuild,v 1.2 2014/08/14 06:23:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.3 2014/08/22 11:09:44 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
new file mode 100644
index 000000000000..b1d7aec2aa44
--- /dev/null
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -0,0 +1,144 @@
+# 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.8.2.ebuild,v 1.1 2014/08/22 11:09:44 idella4 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"
+
+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/${P/2/1}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P/2/1}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P2/1}/${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.8.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
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+}