Bump, docs are still 1.7.0 until upstream updates

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64

3 files changed, 156 insertions, 12 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 4f9a7492ccee..530e1ce524e1 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.201 2013/03/11 14:11:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.202 2013/04/16 08:58:35 patrick Exp $
+
+*numpy-1.7.1 (16 Apr 2013)
+
+  16 Apr 2013; Patrick Lauer <patrick@gentoo.org> +numpy-1.7.1.ebuild:
+  Bump, docs are still 1.7.0 until upstream updates
 
   11 Mar 2013; Justin Lecher <jlec@gentoo.org> -numpy-1.6.2.ebuild:
   Drop old
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 36b7d0aa8feb..b950e0a5a868 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX numpy-1.6.1-atlas.patch 829 SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d SHA512 84e5a820fad9bb2c97c866891b7e4cd5d025c21b4ccff2703b57eabdf3597cb9162d528d13863e1f6fa6b1e50281b2066f12b975feb88cc905b6da6cc60adde5 WHIRLPOOL 1f14425a1dd6717611a77693a90a94e60bde5ecfe82e5d26c0c38aa33e0374b363c135e906ec51c382bf62761d95aa9293d0f98ccf04e07544ad184d39e9d965
 AUX numpy-1.6.2-test-pareto.patch 1857 SHA256 6e5d42323fdd76ad8e4c7d9dfd313f27e5b301f9ec3a98810779f6e6524e9675 SHA512 342576c546839ed601d32542947b52684b208c89a9fa93176f7d2b1ca77bd7c1179ea2513f094a59a55d01d686cda2b9e2cc07ca386e4c4146fdcc6f980b7235 WHIRLPOOL fae26d2cea2d28b9a569fbf4195401b4b342e25468cf7e3d0750adb306a61d22ed88d1903f8f382740f2a7d76e5c277bb6fd9b622530fe16d14aba0266828583
 AUX numpy-1.7.0-atlas.patch 845 SHA256 fe1097351178aab9fe7fbf4dde87a2e177c53989b6080bb5b2a9059fd596d83f SHA512 a9c4a8b9a11c58462cfc13beec8e5f4045a302c833e792cd42b35d5a0cfb497b594d3cfe8ea51108f447bcdc22308f74bd9dea108de1e6491e3adc761be7dd42 WHIRLPOOL b815cded5082740c8941a6c976345465e1815a926c2bfb8bdb940096f4e928a7065dbbcc3a9b195584dbca0612c725d6a4a6b260fabd50f8ad9af7c29cb9fdab
@@ -9,17 +6,12 @@ DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d43
 DIST numpy-1.6.0-user.pdf 474664 SHA256 d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f SHA512 6af1275e46cb0df11d2654f191871504683bb3b5752e45ec6cca92d302babc4e66bd35dc037fdb48c8aad2a8a6414ba239b8874cc590720150c94a832a8cce74 WHIRLPOOL da8fc8a074d8b5a01f566f3c844d668c7652dba03cc618d9d2c162b72fec864a580e05cd940417dd8fcef4bb2c8340bf8e17d166fb582909ff69098332844e91
 DIST numpy-1.6.2.tar.gz 2585329 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6 SHA512 a92667b92ecf2942bef4715189facccb8726866dfd90522b8e4b1e65991d1e6448ab06962e40a7cb83adaebf37eb48cf61417e7ba367da425a2ad7b3302a60a5 WHIRLPOOL 7aa9d7a1ca69bb9a6ce1cc5930997a5b9b8c9573ba261812706c9f12ea9ed42c1fd948552e25049d7b606fd3fda27c6a3ea72e2ffe43fb16e999b0b62515b32d
 DIST numpy-1.7.0.tar.gz 2832457 SHA256 f4fa70b7edbab65ee6432eb63743f5489f1919c614632b20b2fb45aa7e682ac6 SHA512 a485daa556f6c76003de1dbb3e42b3daeee0a320c69c81b31a7d2ebbc2cf8ab8e96c214a4758e5e7bf814295dc1d6aa563092b714db7e719678d8462135861a8 WHIRLPOOL f670aa76673336ac2dcd213112ba2b4c54c6efe56d71343b8f19b7df04cea07671c3bb8247d72b12940d2ae83e9d91c045f687681322b708a9f259b637234e0a
+DIST numpy-1.7.1.tar.gz 2838240 SHA256 5525019a3085c3d860e6cfe4c0a30fb65d567626aafc50cf1252a641a418084a SHA512 d58177f3971b6d07baf6f81a2088ba371c7e43ea64ee7ada261da97c6d725b4bd4927122ac373c55383254e4e31691939276dab08a79a238bfa55172a3eff684 WHIRLPOOL 5374e619edbd3a3e7e478e1baf585d1868f832aa8864935e1498652e2128bf79284a25d5d0ac153c703e1a5d97f361081181eb3402f6e07141324d31eccf390a
 DIST numpy-html-1.7.0.zip 10831068 SHA256 469a8e6f21544204b6e338eb88519c04ed22a6b5e3f3b098f0cccf0ffe08c8b1 SHA512 b68b44102aa4d2996334adce3ddda090f373a4c5bd006daa9cf59f092445d5b768121afe4d10855058d6489ff52bf70a7645b7ff79555de709417f13568bfaac WHIRLPOOL f696258ebb7c78bdfee948bd9119d868b77048c73c805230f0f40d71be891cbfa5bccf21e714cc4389daf1792abb6aeaf3ae18e91889332b9aafa79c865f34a7
 DIST numpy-ref-1.7.0.pdf 5161456 SHA256 0581709ef96441953404bc1369d70117b83359aff94f44779b960bed30a156d7 SHA512 9a80ab2b412aa34ce019454c438b129d1e94b2264306f3644e97c87f4f7b54317ee626274d865c04891005ca8e8f5e3773681a7af590dd89d64df9462d0f0004 WHIRLPOOL 0f10177fd24cfe93555f28440ddc3567a787f2cef336b2f2774b038caafb6807f738d1f3ee3d5a5f26883c567e4017f8365069f25ec7cba5234c537602351729
 DIST numpy-user-1.7.0.pdf 404104 SHA256 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18 SHA512 20cec2f9742c0604d9db9f2e74e7c8fda1782c081c27437a07c2d8cb7f36be6df3e50e5ddf8cc10a076905b2be2b6927af15d0574e3bee2961cf14aaca55ad78 WHIRLPOOL 792c4ccd155ddbb82d8a93959c218bcc001532a6b3c42626bef64c96eb865601f5ee328d1a1627f1656e0b22085c89ede39d7f94183841e1069d183589542ffe
 EBUILD numpy-1.6.2-r2.ebuild 3991 SHA256 197b585450c950598576a0657c249cf0c8c667c1f8e79dac5ab05f45935c1755 SHA512 ba232a839c63192276f48c7d667773b1cb0f25a018f34c0e5025a2859f21d37feddb09c67a544e3ecec29dfe7b3d2f63779fba0172b4985d35d9c35a731ab793 WHIRLPOOL 7bf16fcad516169639809f2c8e84f885c85794cae3e5f344cc22239ef2961932be798c3d42ae3c094e4390a33c6a1810270def1dddb4c13ae80d81291f06c334
 EBUILD numpy-1.7.0.ebuild 3904 SHA256 27f7ea292d8c807606483c5b4593442d9a15508320216cb657e0657ed205f8e9 SHA512 8e3857b8d68a2660bae59d67abfe7444c4e92ee86b427a8cdca17e3c5620d9165ad0dd37f914d7bf7df0fccca6eeb48b410adc7297918bf539e6bb1ccf672247 WHIRLPOOL f771d2509dcb189f3de50b39cc75c35d70019a2b61d4414c22d7e1f2c194eaf1b8d81c6c9697833436a33c23e6acb3e8af72a465769b49b6f5b5f2317eebd915
-MISC ChangeLog 28105 SHA256 ab869008fc1efab6e0c552c3fdd224594641a949ef5a921fbef9c9fc5cc57741 SHA512 3f0c46cb9489c4413d4ea3199b2758383393d6e75da9e76a741145f9512c380f3fe5a982b352d48ef7e862b4947a3b07a96a0d3b3dc784f50ea6e769e2d436c6 WHIRLPOOL 71ebf3769b2538ed787f95c8ccdcb82cfd51ee12b79a0677fa4279636e61c33d9bd2d65c68d9a2c1e623d3ae3b62d0db2a679b9598a8e03ba745f3a0edfe6d87
+EBUILD numpy-1.7.1.ebuild 3947 SHA256 3f92dd37c70ad7907522b2cc78788d8d41e11e6fb67c408102dd730e0736a2c5 SHA512 6a9ebb1c23dfb40b8d463b1532f50fc3b95849669ef6b161dafec6d7cea7dde5b153de303fcbf55e4a03ffc920860fdbfa3d5cc381bfb3a3f5a73e338bb0a59a WHIRLPOOL 94d3fccb21d493e6c4603127af3c468e0460cf513df15fd9dbba1278ac16566cc1ed8d00b1f7cee07a1e46bb1a8d2ff96a011d1908767f13a4927c8cd6a0c609
+MISC ChangeLog 28260 SHA256 5b7b7d66ee2c2ca473d96b1682a0179af7efb84fae1e71a4911aeff85aca3876 SHA512 c3bbb68730730e0891798c41c60396cc86062133c9900ca17b456a6de4db49e63cfa9a20b698e2a4c3d60b5bb9becff2ea1d772dae27a55e535da7039b5b9579 WHIRLPOOL addbf7b63f67ffa0006b0b3057c5cdc561c5e62e915d09b3f6666588ba314f94629a8a500f9f649f011492a9622a636c0890d5e0a8f78f7baf98bdf951847fd5
 MISC metadata.xml 690 SHA256 9c315188497956a9b1e2a1373f7830f702cf9b588aabc33a3f5547ab75b20a84 SHA512 1adcf955fdc7f06b56a69c6345b79a4fb0ca0df17cfdcd1f3604a234389534f8f00b88ebddb3e47a39d563d7374d40349c3e4050799a31405446a1629f8c7698 WHIRLPOOL e2b34ab0b391c99a279dd11de292aafd9225f9743ec3bafafd980edb7522e772cde461705d5394569aa8dd73e72a210560eb50a23b2334ab5c12ec064099abd1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlE95fsACgkQgAnW8HDreRZ8XACfZfNeooLvgVzzZKP/PHl2opLW
-MYsAoNMJuZb+VvpyodOumzIs199Ca/pH
-=86TY
------END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.7.1.ebuild b/dev-python/numpy/numpy-1.7.1.ebuild
new file mode 100644
index 000000000000..0f7fef7c1aa5
--- /dev/null
+++ b/dev-python/numpy/numpy-1.7.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v 1.1 2013/04/16 08:58:35 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+#DOC_PV="${PV}"
+# upstream is lagging on docs
+DOC_PV=1.7.0
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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-0.10[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	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'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g'
+}
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${PN}-1.7.0-atlas.patch
+
+	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
+	if use lapack; then
+		append-fflags -fPIC
+		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
+	"${PYTHON}" -c "
+import numpy, sys
+r = numpy.test()
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+
+	rm -f "${D}"$(python_get_sitedir)/numpy/*.txt
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html
+		doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+}