Version bump

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

3 files changed, 166 insertions, 7 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 0770c5c602ff..c073e73ca952 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.150 2011/07/23 17:26:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.151 2011/07/26 17:23:55 bicatali Exp $
+
+*numpy-1.6.1 (26 Jul 2011)
+
+  26 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.6.1.ebuild:
+  Version bump
 
   23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> numpy-1.6.0.ebuild:
   ppc64 stable wrt #371673
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7bf0bbaff087..e91800100d54 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -9,17 +9,20 @@ 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.0-html.zip 9242421 RMD160 5be379440247a85cc27462c16a3a0c8135fdc8fe SHA1 122fb678ca6eaf088da61991a08da4739c1059df SHA256 555cfd5899ee54d129169fb70e418c2593d5377ea963d50c812f25bb182261e0
+DIST numpy-1.6.0-ref.pdf 6106335 RMD160 7a7b2a3541aa92d3306cee5fd26cd9bfddddaec9 SHA1 4a7124ad2053719d5557fba4628c62603a627547 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f
+DIST numpy-1.6.0-user.pdf 474664 RMD160 3cf60eeb5ae82759aa1cf61be2a5f6a066637aa5 SHA1 1854b924316660a51ace516bbee3e24533a22ce2 SHA256 d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f
 DIST numpy-1.6.0.tar.gz 2633698 RMD160 29bee854e1436e0baad46150606d7a0d2d80ac61 SHA1 0692acfb5cdc55ca251aa2b950e321a662810c36 SHA256 687dcfb5f6a51f2107ba1dc8bb324fd1a0146ce8b0e2bd01a3ee7bcc453ee3d8
+DIST numpy-1.6.1.tar.gz 2637779 RMD160 e4619fd5860c85a9c00bce0d0cb8dd9bb07a56f5 SHA1 3f73ff9231a1c15e28e6e259ef5cc35a72b34059 SHA256 788b1bc712ee566d4b4d62ef99736c5830fa264cbc56f8651ded1e795c755cdd
 EBUILD numpy-1.5.1.ebuild 5107 RMD160 b86e103a1f358cc172d24655a4836e19efaea7c2 SHA1 20d1865d2edd1b78dc44de8801d167c4ec140eab SHA256 7559513f731ed9ac96ae60de0e35df84ed8ba3f5f6045cabe18efd6250a709a8
 EBUILD numpy-1.6.0.ebuild 4801 RMD160 590604f459ed3f1e4a810e3cb7440401d49c0dac SHA1 846f45b4d4c3492ef50486224af58b1540dbb963 SHA256 fcd824bd3d81b721175c0037922f4752287914b618f01d0c9d6669c5ba5e4c3b
-MISC ChangeLog 21283 RMD160 c8c91b9ebd4602990f6308ce2d22f23de5b81c4b SHA1 e060012fdd8b4c8c813a1501f86279f3d5ec5b61 SHA256 3d47ccf3066b96ddc8ccb53613896752ea847637e02d86e89ff6dff6a5572843
+EBUILD numpy-1.6.1.ebuild 4805 RMD160 9cd43b61a9cfc874e88c9317a445ef1dc0e0ea63 SHA1 9ae98b6b3700fa8fbcee0d82fc31385896f38211 SHA256 9b340aeaf6bd817b103330dd2225baf020111d18d27b6cb86928e37088ff3d7b
+MISC ChangeLog 21401 RMD160 943e1a0139d80c5563e6af7fd7e5ecb048ad2d20 SHA1 f81147bced65275fe0160032bf0b93463bc40221 SHA256 e90b4d4114fa2bd667867b9317fa5b0eedb0fc0ced8b877c321723b6e55618d6
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4rBDkACgkQIiMqcbOVdxRYOQP/Ru7Fk0FcoKQIb97HXCT8i5dF
-kIPpM9sFUpQShopcmwIltCzpFzR/pzFquC72pGE+0qTgItK7ukc0m33eptiaIsNI
-fTnD5Zjtsb9SFd9tvkHrOyMkoL/93Igru0dAqAxXM5twqA6C2ZfgWL505c16y1Rs
-GgOcXm6g3oZtVJEZkMY=
-=LKIk
+iEYEARECAAYFAk4u+DoACgkQ1ycZbhPLE2DJaQCfdOkiafkcF43+fdtDUE/flSpV
+3+sAoIF3rnzY3HOI11elazvNKIANeVEn
+=MBa5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.1.ebuild b/dev-python/numpy/numpy-1.6.1.ebuild
new file mode 100644
index 000000000000..e55b807f4439
--- /dev/null
+++ b/dev-python/numpy/numpy-1.6.1.ebuild
@@ -0,0 +1,151 @@
+# 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.1.ebuild,v 1.1 2011/07/26 17:23:55 bicatali Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit distutils flag-o-matic fortran-2 toolchain-funcs versionator
+
+DOC_P="${PN}-1.6.0"
+
+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}/numpy-html.zip -> ${DOC_P}-html.zip
+		http://docs.scipy.org/doc/${DOC_P}/numpy-ref.pdf -> ${DOC_P}-ref.pdf
+		http://docs.scipy.org/doc/${DOC_P}/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 virtual/fortran )"
+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() {
+	use lapack && fortran-2_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
+		append-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
+}