Version bump

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

3 files changed, 148 insertions, 6 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index f2728fa063cd..0027e37bdcbb 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.158 2012/05/12 20:12:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.159 2012/05/22 16:34:49 bicatali Exp $
+
+*numpy-1.6.2 (22 May 2012)
+
+  22 May 2012; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.6.2.ebuild:
+  Version bump
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> numpy-1.6.1-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f00ee901d8f5..36c3d7cfdaa2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -16,16 +16,18 @@ DIST numpy-1.6.0-ref.pdf 6106335 RMD160 7a7b2a3541aa92d3306cee5fd26cd9bfddddaec9
 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
+DIST numpy-1.6.2.tar.gz 2585329 RMD160 4dcaa30e30171c2bc582495043e8e885c89935a3 SHA1 c36c471f44cf914abdf37137d158bf3ffa460141 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6
 EBUILD numpy-1.5.1.ebuild 5120 RMD160 176aac4d5e54b5f5f82ad088f1caf861d6db61a2 SHA1 8f0e749f6ee22ccb491dc60263f98d979022e5a1 SHA256 f3344769efc746065631e0e34913eb8edd76d42021f930083907107da6eee114
 EBUILD numpy-1.6.0.ebuild 4808 RMD160 ae7899121b545b97d139afb2c365f9ca4c3e135d SHA1 81dcc2ccf959d143dd306255554a1168894614c9 SHA256 924553aaea1ebbdfe4ebea358c11023885ba67d4a97c8886e02bdf26622c0655
 EBUILD numpy-1.6.1-r1.ebuild 4219 RMD160 c3e3187bb620361d1c732e3f90a52bfbe1826fd3 SHA1 8210d74ef555c6bbe6a1fd2ebe3f4162583bb1b1 SHA256 fde0fec50692bbdc57115ba2d97574b9ba2dc9c063a67f9ab093318d487aea03
 EBUILD numpy-1.6.1.ebuild 4829 RMD160 79ef6ec8df7b089268e263969a850d59dcb160f5 SHA1 01e70316e8f3be6b3403b9b035d6dddc52bdb978 SHA256 90a2e8954594f0071c40c105da6482fd98e3035e88179a424d15c44ef6768643
-MISC ChangeLog 22526 RMD160 ce3a71b1d7ed242dc7a42774b71fe12c61793584 SHA1 204f0d37b82f3201107da8c2af6e13fd2ef217af SHA256 ed6d3bd816d375df6bcba7f29f557dcab66f6a82e66e6906ddfc05da81d343bb
+EBUILD numpy-1.6.2.ebuild 4177 RMD160 3032bbb4b8a65b1cee967c119169f2189b9daf7f SHA1 a6c83f224fe3d39e2f8b4c132e20ae82e9c50952 SHA256 73ffc2076f9390de8c6961c188011b9acfa572c0ab3b60c3324a80c44d85c028
+MISC ChangeLog 22646 RMD160 7188a2c1f6873dde6239e7fbd1fd0e3267fc1c77 SHA1 ae2ae0763825dbf55169ec64fbb464ac18f8a7f5 SHA256 7cd4e0d9b7754e032198135c5001596498f4bb22db8dd78f4f6df8114e413ff9
 MISC metadata.xml 615 RMD160 2f09f0eca557ef9bdc4c672c8d2172b66e25ad69 SHA1 189dc5a2f5d3cb26680e81987501a4266c4972d1 SHA256 f50bbda17ece7ce10e62c739225822877af67a95b3fb9b6a861ee31db489cab3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+uxDsACgkQvFcC4BYPU0oASQCePAKeiVjB3/vzhm/2mOJt8iJs
-tZQAn16x4dNjcvIMxJa38dDKD8dGuRFB
-=Waho
+iEYEARECAAYFAk+7wDIACgkQ1ycZbhPLE2DIDgCcCDA14fb73cjgfij8gCzFyrEH
+xtoAoI5YLytG0YxRKsMU3uYzSXf62laJ
+=JbEP
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.2.ebuild b/dev-python/numpy/numpy-1.6.2.ebuild
new file mode 100644
index 000000000000..aacd7ffe97aa
--- /dev/null
+++ b/dev-python/numpy/numpy-1.6.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.1 2012/05/22 16:34:49 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+
+inherit distutils eutils 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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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? ( virtual/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() {
+	epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch
+
+	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
+			[blas]
+			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}
+			blas_libs = $(pkg-config --libs-only-l \
+				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			[lapack]
+			library_dirs = $(pkg-config --libs-only-L \
+				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
+			lapack_libs = $(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
+}