Version bump.

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

3 files changed, 173 insertions, 19 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index e92985b8dc96..6500e57aa8ee 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.139 2011/05/08 00:36:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.140 2011/05/14 23:19:13 arfrever Exp $
+
+*numpy-1.6.0 (14 May 2011)
+
+  14 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +numpy-1.6.0.ebuild:
+  Version bump.
 
 *numpy-1.6.0_rc3 (08 May 2011)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 2e7fa1425df7..69da0ab003c8 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -9,27 +9,25 @@ DIST numpy-1.5-html.zip 8545276 RMD160 41636f21c2c82ed1d9f15fe595c9d9303f62a2ee
 DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 SHA1 5e496e87a4f9873759397cb1cf546f6af0533598 SHA256 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
 DIST numpy-1.5.1.tar.gz 2280220 RMD160 6d8f03e4cd2db48a7c9ac39b441d9e0219b15dcf SHA1 423c6bf74f9ac00697db574ba981547991110896 SHA256 c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
-DIST numpy-1.6.0b2.tar.gz 2628966 RMD160 3dbd85fb21b8ef896fa5226a708d9e87f5fb52f2 SHA1 801af45c39ccc363153dbdb2e204195ac900a89f SHA256 d1025b7529cbe4d8d0278612be6f250200ce62210bd4f3cdd4b9ccba54f5b8b0
-DIST numpy-1.6.0rc3.tar.gz 2633752 RMD160 4e2e32307124b59d957939c4ca3e604f31c9b806 SHA1 8fbd38466876fee72b5124220632133f3494eae8 SHA256 0abe9ed1fa1127347205d46b991470477b6b234d6e623c1b705e91e5dc105d55
+DIST numpy-1.6.0.tar.gz 2633698 RMD160 29bee854e1436e0baad46150606d7a0d2d80ac61 SHA1 0692acfb5cdc55ca251aa2b950e321a662810c36 SHA256 687dcfb5f6a51f2107ba1dc8bb324fd1a0146ce8b0e2bd01a3ee7bcc453ee3d8
 EBUILD numpy-1.5.1.ebuild 5134 RMD160 26807c1616834d2c1b3c076c104ce6072f4f6612 SHA1 426ec67907d17faa8074f1305d2ff34723773854 SHA256 80192127e48eb9d9049b6996724261b9c624b29fba35840ad4fcd6c4d9c6f13c
-EBUILD numpy-1.6.0_beta2.ebuild 4874 RMD160 638372fad8a7be699647d64fbbff3c9f42df02a9 SHA1 d76b7bcb0787ddfea426a21c41a4172eea32d593 SHA256 e455a5d2b563275eba240683c467dc4c409fc24edd01d824ed59fc8d80676e99
-EBUILD numpy-1.6.0_rc3.ebuild 4905 RMD160 c877e3950286ff51c0f06ade8702a1cf9df26bea SHA1 b36c01da5e86ad55c2c641c31f4526322a65e696 SHA256 b050a07fc34f6eb2c6d2c8fd0f7784ecd77a44d8ca1e316e6f5e76a271793df2
-MISC ChangeLog 20015 RMD160 220859f6fd9e65f01b36855e167181d0228b6028 SHA1 5d049e69845bf8406d289c32f3460813332deaa5 SHA256 de4054d2606cc47ff51894df7e98c6acf6a2fe922b66608333212ddbef1541a5
+EBUILD numpy-1.6.0.ebuild 4835 RMD160 026dc411c38c53f1b593e0a7b0529f52b81c10db SHA1 f9fce4ece79c0f1bf497b4e9ab38ce98f6c433df SHA256 83478b8ccf5d5d34a5633840f2d832f52c8f6e904321a6ec6a4a5a75bd7c3a6a
+MISC ChangeLog 20156 RMD160 97f1ef65da55cc373fad640aa9d1ed361baedba5 SHA1 3042e395fcdd4e5d028612db9068301f523b3d76 SHA256 fead39d47b800c35f935e5e43f425c09eab06820bba87a2b01c442bac46e5436
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNxeWxAAoJENgZr6v6gHY0irUP/2/caYdXGhMGU/HViY8bERL3
-u7a6RHtES8+yjicpfdXD0sZv/Sk7OGmQH5EWzscTrQYY5HBG/RZGqTk3QO//+XWo
-VHl7vghEqfI40Dqh85XLhABOSP3nFM4J2+nswo7Vmk4SwfWhyNuRwcVKtiNfeIL1
-RfMdQWBe0BDli9kcosvaqHUmfaCOxa0jUAWrUgiG+Gvlolc0+ySL86YjmzSXgPmM
-K0QbTpdCpnjo3sSwtVq1ATWgSU1lrKcQv9Ph9KlHyvGQ02ZS3bb1Z1OoX94+Fwfi
-9cojWYfBY1S1kLT0zFj19+PGBMWYu0MTVuRfBR/viZi1CziDbXWgZd9Lj3MdCA1f
-6PKA26iP24THHfVPTcn5htTHl/O3vR7XTNAwAE7pXA13yh3/mgwZRxjjTl5c5NDp
-FYMConEjyGylQAc3HYyeGj5Ey9X7A38YXui6VVBMfOTzTOAMV2/SYV+w8bvXeE1D
-No/vKzpk2BKNhQtuH1l/9SR8UWJWHu4sClNH/2hBdqGB3n/+pF3ctW3DFuhJk9KE
-5cgCxGJLCIg9HIV6QdD43bWgT6rALDK0F18D7uzifjPEDJHr6h9PudJSe4zNr3p2
-A1S+1DsGtJC4jMkUSCX7rRGBrnmjf9DVFDEBwMyig7LPw7qJVZwzUNf0Ezj5AuJe
-ksDI9aLkGJiQfeP99qpR
-=3wRe
+iQIcBAEBAgAGBQJNzw4IAAoJEE70JXb4HvNVLwAQAIO7DgcbG/RnQd6idCsFhhsn
+u7aDMV2tN6b6f0hJ5uarLI5IAjBR03Vxb2JwpsPbVaDZzx0m14/tEnEBhlMuUsoz
+Rd5j6Lgtr3xIuCm6f0s3P2+WSnIYigBIsUBebFWmgncczcwgoN73G+9v37o2Qtf8
+ePU9JO+naf8T92N54Bq7VI+dovhaON14a8btMivzchygCMI8SA+ZEPmx4dLKICPI
+0mmUa4KxZZ+E3otFFGMK7ReidlQynCu1eXoCXYbhPSzUx/EVcPdP1SrFsFu2oroU
+6RgTSlW1uGlYDNk/NbuhLibL85WUDMSJFCBWl9hrEPAY54p2mxnaxUIKy1nLjYR6
+cZQKOKb8jthZJQ0BVlb3PEdogKCf+XdWcsunS7XwCh8xk1/mnSUSDBES5JJ+0P90
+wRCjf9OYUdzf1bgvQp/DmXN5HTP+/BiNx6f+x/KNbzIIR3m0nNYkncR+HCNgQfxw
+WlnK1HfPWCz/pZr9F0NrE9Ekze+BIoqn95w3aygLUyf9Oc4hIIkrAIUX6WNb0ecN
+LjiWoBfazOXy7x/+1LjgylbvaCGFdZn+3EFJodSVJ+TRnfjtZng3OVgEdnfvtSk2
+On8b9DezDlK+ThDrF/pf1Gz63O5SYV9owdLjUDDrDRK6h6CAMRBVg+MXrQcXyOgd
+AGfuN0KjEElyoKykGxBk
+=kQQe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.0.ebuild b/dev-python/numpy/numpy-1.6.0.ebuild
new file mode 100644
index 000000000000..3686cb94e1dc
--- /dev/null
+++ b/dev-python/numpy/numpy-1.6.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.1 2011/05/14 23:19:13 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit distutils flag-o-matic toolchain-funcs versionator
+
+DOC_P="${PN}-1.5"
+
+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/${DOC_P}.x/numpy-html.zip -> ${DOC_P}-html.zip
+		http://docs.scipy.org/doc/${DOC_P}.x/numpy-ref.pdf -> ${DOC_P}-ref.pdf
+		http://docs.scipy.org/doc/${DOC_P}.x/numpy-user.pdf -> ${DOC_P}-user.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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}
+	doc? ( app-arch/unzip )
+	lapack? ( dev-util/pkgconfig )
+	test? ( >=dev-python/nose-0.10 )"
+
+PYTHON_CFLAGS=("* + -fno-strict-aliasing")
+
+# Build system installs f2py${Python_version} scripts.
+PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
+
+DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
+
+pkg_setup() {
+	python_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
+	if use lapack; then
+		[[ -z ${FC} ]] && FC=$(tc-getFC)
+		# when fortran flags are set, pic is removed.
+		FFLAGS="${FFLAGS} -fPIC"
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${DOC_P}-html.zip -d html || die
+	fi
+}
+
+src_prepare() {
+	# 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
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+}
+
+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 -Eq "^(ERROR|FAIL):" test.log && return 1
+		popd > /dev/null
+		rm -fr test-${PYTHON_ABI}
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install ${NUMPY_FCONFIG}
+
+	delete_txt() {
+		rm -f "${ED}"$(python_get_sitedir)/numpy/*.txt
+	}
+	python_execute_function -q delete_txt
+
+	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}"/${DOC_P}*pdf || die
+	fi
+}