Version bump. Beta only, does not pass test suite

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

3 files changed, 176 insertions, 5 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index ed8440fe7258..9f5ee6a89b22 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.135 2011/03/25 04:45:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.136 2011/03/28 18:51:52 bicatali Exp $
+
+*numpy-1.6.0_beta1 (28 Mar 2011)
+
+  28 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +numpy-1.6.0_beta1.ebuild:
+  Version bump. Beta only, does not pass test suite
 
   25 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.5.1.ebuild:
   Allows cross-compiling, bug #356381 thanks Dylan Smith
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b1e166ea0c5a..e7e56ed15e33 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -18,16 +18,18 @@ 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.0b1.tar.gz 2625349 RMD160 89b6577c96f3eba69045c58b581c9022e723bde9 SHA1 67d03f58a5a107ebf8b3506686db0abe69e33365 SHA256 fc21c21a103bae3eca07a55c863dfbe5b6383efd404a1d6aa462a9d090efa80a
 EBUILD numpy-1.3.0-r1.ebuild 4351 RMD160 cb03efd164e532fa8661b3a2126510feb8257531 SHA1 934fefbc6b3a23d6b1094f25107222669c2d4b44 SHA256 7fc8909ae4aebfd2b5c5465b463bd52090d070d36d132f88cbb2412c624c4be2
 EBUILD numpy-1.3.0-r2.ebuild 4880 RMD160 ab964443b724f146201e351fd4f265e340dc5dc5 SHA1 f2bfe5e06dce10b9a0195358b00d6328158c302d SHA256 1f4a29bf3f2a938fa48a76c54b74a68ebc23b564273928c79630cab5478e0aa6
 EBUILD numpy-1.4.1.ebuild 4629 RMD160 20bba506d589ef5703a165253a59e00af802464e SHA1 be71b5be59fb594325927c9d39b8a0162d3c7d69 SHA256 c4a60e6059dfdff138bfeedfa96c350c4ae73b8e7834e7e68abec05b5579ac1d
 EBUILD numpy-1.5.1.ebuild 5138 RMD160 6ad127f6a146348b367253b3869297e74a69f60d SHA1 04247b5d6cb9e64fcd23ecd73006c3cdd32314c2 SHA256 d0b6e3980da0fd717561ad4efaaac1def7f9cd595a678c152f405521b89450c5
-MISC ChangeLog 19430 RMD160 d890211c22c918bd97946eb8347437a48b3a00bf SHA1 92be2223e3799c4c76c0feaf39d98dbc078fdb3f SHA256 8cddbec70dcdd9683c049da749c67cf5b4539934dc2a8e075f97db889ee79a2b
+EBUILD numpy-1.6.0_beta1.ebuild 5203 RMD160 bf21191e6974674c8358799340fce2ba5f239216 SHA1 4fab6477019a434600cea262dd391f2d721a089b SHA256 58011934d8786b411c0163a83b285b11ec2f82b98d2f2cf49f03eb5719bbc811
+MISC ChangeLog 19601 RMD160 0033330ebd88cd3d3a545c6d53528920f8477ef5 SHA1 9df412f1f76eac25f0961b0cd60485163187c484 SHA256 302e6477ab4e1cd4473487c746a78bc74f816a69cdbb77bcefc7f37af963fab8
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2MHd0ACgkQ1ycZbhPLE2AgHACgk9UvrmEiiIK0cvr484M1HefR
-9TQAn17PRAwmc5wKMk6AFFmQoS0lOiet
-=1943
+iEYEARECAAYFAk2Q2NEACgkQ1ycZbhPLE2DCmACeOjAlhe0oq0mllNpwC6rQ0Rcg
+1EoAoJxVHdFUPQ9N0RQaLbiPY3EsCqgx
+=SpIJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.0_beta1.ebuild b/dev-python/numpy/numpy-1.6.0_beta1.ebuild
new file mode 100644
index 000000000000..5cf7a7d80c0b
--- /dev/null
+++ b/dev-python/numpy/numpy-1.6.0_beta1.ebuild
@@ -0,0 +1,163 @@
+# 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_beta1.ebuild,v 1.1 2011/03/28 18:51:52 bicatali Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator
+
+MYP=${P/_beta/b}
+NP="${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/${MYP}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
+		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
+		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-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")
+
+DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
+
+S=${WORKDIR}/${MYP}
+
+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
+	use lapack || return
+	[[ -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="${NUMPY_FCONFIG} --fcompiler=gnu95"
+	export NUMPY_FCONFIG
+}
+
+src_unpack() {
+	unpack ${MYP}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1.0-f2py.patch"
+	#epatch "${FILESDIR}/${PN}-1.3.0-fenv-freebsd.patch" # Bug #279487
+	#epatch "${FILESDIR}/${PN}-1.4.0-interix.patch"
+	#epatch "${FILESDIR}/${PN}-1.5.1-python-3.2.patch"
+
+	# 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
+
+	# Disable tests failing on ppc/ppc64.
+	# http://projects.scipy.org/numpy/ticket/1664
+	if use ppc || use ppc64; then
+		sed \
+			-e "s/test_nextafterl/_&/" \
+			-e "s/test_spacingl/_&/" \
+			-i numpy/core/tests/test_umath.py
+	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}"/${NP}*pdf || die
+	fi
+}