Version bump. Modified patch accordingly, and URL for docs.

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 186 insertions, 9 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b49ad0d80fa5..4e17b8ecd9a6 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.187 2013/02/19 15:34:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.188 2013/02/19 20:17:28 bicatali Exp $
+
+*numpy-1.7.0 (19 Feb 2013)
+
+  19 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numpy-1.7.0-atlas.patch, +numpy-1.7.0.ebuild, metadata.xml:
+  Version bump. Modified patch accordingly, and URL for docs.
 
   19 Feb 2013; Justin Lecher <jlec@gentoo.org> numpy-1.6.2.ebuild,
   numpy-1.6.2-r2.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 1277dbf96f03..fb4532d36a16 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,18 +2,24 @@
 Hash: SHA256
 
 AUX numpy-1.6.1-atlas.patch 829 SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d SHA512 84e5a820fad9bb2c97c866891b7e4cd5d025c21b4ccff2703b57eabdf3597cb9162d528d13863e1f6fa6b1e50281b2066f12b975feb88cc905b6da6cc60adde5 WHIRLPOOL 1f14425a1dd6717611a77693a90a94e60bde5ecfe82e5d26c0c38aa33e0374b363c135e906ec51c382bf62761d95aa9293d0f98ccf04e07544ad184d39e9d965
+AUX numpy-1.7.0-atlas.patch 845 SHA256 fe1097351178aab9fe7fbf4dde87a2e177c53989b6080bb5b2a9059fd596d83f SHA512 a9c4a8b9a11c58462cfc13beec8e5f4045a302c833e792cd42b35d5a0cfb497b594d3cfe8ea51108f447bcdc22308f74bd9dea108de1e6491e3adc761be7dd42 WHIRLPOOL b815cded5082740c8941a6c976345465e1815a926c2bfb8bdb940096f4e928a7065dbbcc3a9b195584dbca0612c725d6a4a6b260fabd50f8ad9af7c29cb9fdab
 DIST numpy-1.6.0-html.zip 9242421 SHA256 555cfd5899ee54d129169fb70e418c2593d5377ea963d50c812f25bb182261e0 SHA512 b3a7df5b3bb4d307b9184ffa7a0f7a8d919a70f642d9be3d1b3d9c837516385423cc05ba114310e03e124fc80033216035ff389a7f56b74ac1a849c975dbdc8c WHIRLPOOL 6edeecf637e5ca23c906e51dd4933bb6ab4beb3014a9c2cc6d59459d76dd8bf617ea6e3c1d5d5a15af17022549812d358a37840b8d47841d14e156fb6b319600
 DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f SHA512 ff00333beae3d886cf96cd72687f68dd0f226c88c390824c3f0cfc18a50ea6b8d6e12035eda76e10a97d58e7bc9b48b6dff7e0447b6045cc4e40fff3225721ec WHIRLPOOL 3ccb0373f0ef0f22a0a1ad967cecc1c7fd8e663d9c4437cfd31bf42a23d121619d89bcfcbb25091609cfdc20f13b551f6d904b1d13b4da6104dfca094734ca19
 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-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 3957 SHA256 0f7d2674264c8f1b6325ec6428534998c9ab7dd158a5f65b770d24bc5c68c3f4 SHA512 18f23d80aadf633c82dcb8c44f329c132cc7802d359602bb543a687be69d5f167407dc16f4649cc2b447a331befcfc74d37c4f65165d9eb7c69742f8df2af47c WHIRLPOOL 6a9c729ec5cc17b32dc108c3d422e969f440894db7d8b927e33e3675335d47ff2ba604ba80d3a4da338d7058939bd4ccdcba5067651c8b77782fdd4702d9f6a9
 EBUILD numpy-1.6.2.ebuild 4132 SHA256 5c50ab0aa84dc8900e9dc497fc15316fea8e2608390cbf83c45f12d556dc5141 SHA512 e79264fa09bc77843d58646ea12b5cf40c9110bc1ae27bf8a895277a46ac821770d424b30ef75c3e59e0c840909d2375bca1a663d8d1b7b3bdb53604adcb1e95 WHIRLPOOL e728f88717e7275b008f222dda3f91fb36466af8f104039c5661c7d7ada3defbe021334a6613bade8bbb03de4bc3d06a0cecf4ce4a40c5d9a98e479d8e573a8f
-MISC ChangeLog 26410 SHA256 37e9b3be6fc8c16484a094c4d991d37aeb260a7cda72b96a8c21d2da76586041 SHA512 b3654ffa7de150999c65be85b4843f9f100b8a390c848e8a6b141436a085efbd37ca167b2f5e00e47e0123466475e9c899d05bf5e109a84bc5775b548b4bf2ad WHIRLPOOL 47882f2b2070ab76e7ea7d746d3d9c898368c03b50a53eb13f54b4429b4e2dc78e31848fe6c4817ede6f6f7b71250875d266941eeeec525bf1d07f7290842f1d
-MISC metadata.xml 618 SHA256 4610361cfafbcd8533c0982e1d804f7f1c4e247bbf41a07102591f22f1034305 SHA512 8c017dd0a066f11291188a3dadac6a23c5f8451231ac32f73771954c530e569de8212e581cd750ff071fc9c9b22e7dbbcedad6e8bfe0c0b0c7b7682f48269dbd WHIRLPOOL 90dbe9165a89a4f57e67859ce58076c3312caa0a75aa79ce635be1cdc5fcafce58bf771cd405630e3c72c795a13023f3374f70480a9e798c5dc3211813a0df60
+EBUILD numpy-1.7.0.ebuild 3904 SHA256 27f7ea292d8c807606483c5b4593442d9a15508320216cb657e0657ed205f8e9 SHA512 8e3857b8d68a2660bae59d67abfe7444c4e92ee86b427a8cdca17e3c5620d9165ad0dd37f914d7bf7df0fccca6eeb48b410adc7297918bf539e6bb1ccf672247 WHIRLPOOL f771d2509dcb189f3de50b39cc75c35d70019a2b61d4414c22d7e1f2c194eaf1b8d81c6c9697833436a33c23e6acb3e8af72a465769b49b6f5b5f2317eebd915
+MISC ChangeLog 26629 SHA256 f1a07244a8ab7a2c72cb3884caaa1e30b3c596ce80d711762ed216b6ac7c1c1e SHA512 42e0370728215c80cb9430dde629d0a093eb2adb6700bc0d08329dddde27e3a629967e5bb01c70eb62a363396688bcb0627097342d92b3261379ce40f85e367f WHIRLPOOL a2848b23e628a5b634ecfdbdcecb66d2ef40cd352b59d97d9d66d9fbfb757236c1ad7517c4aa284cd3ce63f231ff471affa69ff87e097596aded3e28e1374d11
+MISC metadata.xml 678 SHA256 184af17845835a595a8b2ee396a6f55baa7234a7b91ebddcf957a5d69c0b01d0 SHA512 6dbcd40d6722b481caf27183618012f3df43fd6fc22f8ddd6f1a3e9e42bc1240f56573616ef32fe8c3ea52addc42172940b3d7c5fa0938b854baeb96daa53d88 WHIRLPOOL e9b5f50c2b2d34745b255d05f65c6762c34fe34a2f097633621479ce909a1e120322cbcd0ded383fae6511240a14a7e9db4f47592715e2919d1c4d615f9bd24d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEjm28ACgkQgAnW8HDreRaB4QCfXlZd2vEJ4EDrvD5q8LNcONK9
-7wEAoJfrITY8NZGHK4OrvlOayZYVL/La
-=ObNh
+iEYEAREIAAYFAlEj3fkACgkQ1ycZbhPLE2DssACgnB7duzhEI6CrKoyzmk402kLl
+hL4AnA465qgeKaSD2MKLj+PuVE0pe2wE
+=av3C
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.7.0-atlas.patch b/dev-python/numpy/files/numpy-1.7.0-atlas.patch
new file mode 100644
index 000000000000..b2936a9eb878
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.7.0-atlas.patch
@@ -0,0 +1,17 @@
+--- numpy/distutils/system_info.py.orig	2013-02-19 10:15:10.183780548 -0800
++++ numpy/distutils/system_info.py	2013-02-19 10:17:03.565350549 -0800
+@@ -282,13 +282,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,
++    cl = {'mkl': mkl_info,
+           'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+           'blas_mkl': blas_mkl_info,          # use blas_opt instead
+           'x11': x11_info,
diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml
index 3ee58f645122..bb330b7fd39b 100644
--- a/dev-python/numpy/metadata.xml
+++ b/dev-python/numpy/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <herd>python</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<herd>python</herd>
+<longdescription lang="en">
   NumPy is a general-purpose array-processing Python package designed to
   efficiently manipulate large multi-dimensional arrays of arbitrary
   records without sacrificing too much speed for small multi-dimensional
@@ -11,4 +11,7 @@
   basic linear algebra and random number generation.
   It is the successor of Numeric and numarray.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">numpy</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/numpy/numpy-1.7.0.ebuild b/dev-python/numpy/numpy-1.7.0.ebuild
new file mode 100644
index 000000000000..9d504d68ecca
--- /dev/null
+++ b/dev-python/numpy/numpy-1.7.0.ebuild
@@ -0,0 +1,145 @@
+# 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.0.ebuild,v 1.1 2013/02/19 20:17:28 bicatali 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}"
+
+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
+}