Fix infinite compile loop with python3 and gcc-4.5 wrt bug 336781. Thanks to Ryan for the report. Drop old.

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

5 files changed, 40 insertions, 145 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 124623d60bbf..acaadb2b6c3d 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.118 2010/09/10 22:26:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.119 2010/09/11 10:24:16 xarthisius Exp $
+
+  11 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -numpy-1.5.0-r1.ebuild, numpy-1.5.0-r2.ebuild,
+  +files/numpy-1.5.0-python3.patch:
+  Fix infinite compile loop with python3 and gcc-4.5 wrt bug 336781. Thanks
+  to Ryan for the report. Drop old.
 
 *numpy-1.5.0-r2 (10 Sep 2010)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index adb541dce53c..342c4f7e139a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
 AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
@@ -5,6 +8,7 @@ AUX numpy-1.3.0-darwin-no-arch.patch 3016 RMD160 a35968a68fac400e14d5eeafb44e058
 AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
 AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
 AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
+AUX numpy-1.5.0-python3.patch 559 RMD160 880a47284b214c4b2f55e60702130972138a2d1e SHA1 b8981077591b58e3c932769f6fc17b5df5962d80 SHA256 e3b7c082b11219816d687b1a9378db35320c6a632fa066ceab3ea1bc9a3bca0c
 DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119 SHA1 10799530be334cd7b1120a0b46f3c6f5deae5110 SHA256 933724b83300c9fc0779a579dad212ca8dcee230f1d892a56b977f3854d87c7e
 DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
 DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
@@ -17,7 +21,15 @@ DIST numpy-1.5.0.tar.gz 2276377 RMD160 6c6a8ce32d32705b66966c7a58359a0f2f404549
 EBUILD numpy-1.3.0-r1.ebuild 4342 RMD160 879a352a8de2b08c574a65263397c994550ce98a SHA1 0c18d544b1cc67a99fc2ca8ed0b2611d0aa07b69 SHA256 f913bfe4f6e75b0e07d89d3a5428f7aa96a9aee41a9cfc684b34aa1bb77cc979
 EBUILD numpy-1.3.0-r2.ebuild 4871 RMD160 95857c55408844db31856efc0ed9dd76aa79d834 SHA1 7dfa21315306a13cfa2184a419d46034fea7ed2f SHA256 8fee38f0222015c2a9ec98c7dbf6dda4679553284ebce6b11575e9d0d47e238f
 EBUILD numpy-1.4.1.ebuild 4619 RMD160 c056baa71d237c299785fd8a547ef9a1220e3d14 SHA1 50a88d00b13231cdb4506e6eb36297bd03964891 SHA256 afba66d922a6918eb84f840e94bea77498f5c1492709c77e840d445a95cdcabf
-EBUILD numpy-1.5.0-r1.ebuild 4754 RMD160 2c77735b4550fee87182134a26e2e3142f15958e SHA1 58e40da8db02d31d669ccfbb8c6cae99762f1352 SHA256 e4ecd71eecc4cf500713181a238cc3ab33b30f38e58ad6d1d49deb22c724eb8d
-EBUILD numpy-1.5.0-r2.ebuild 4883 RMD160 22134ad6ad830894a62dda83adc5ffd56720b788 SHA1 d8a1405f7b75225e4fbb02d7bbc8f47bec42e0ca SHA256 cf4f7ff6a3ae81c64cc2afb03460822a84568385d571be58bffbf0f03f90c429
-MISC ChangeLog 17212 RMD160 c0ae9fbe1656a14e188cf7be749d8d62daa15dd0 SHA1 8bfca333b12d385660d0e639caddaff49787aa74 SHA256 70e70d8875123eb78cf15a5b489ba2991dac4c77e313429b9af9a22ee9aae389
+EBUILD numpy-1.5.0-r2.ebuild 4935 RMD160 d800c6d06d38f8122de2cad19616ceeb1cc90279 SHA1 d7a2d7398eec7b9e8f597c1deb3f35bf70256ba2 SHA256 190b713e877c0164befc82866fdbbca324fa83c4373d292a9f8c811455ebea3b
+MISC ChangeLog 17466 RMD160 213a1ad8f5cb703c6b156b34f1886b1aef6895c4 SHA1 3347b0779cd60e2656c71498f42f1e61bd665cb2 SHA256 d2fe21469883d5fac037f6109260c0df1b9380859466d744e099bbec90500638
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkyLWNoACgkQIiMqcbOVdxRYsgP/cJjHeA4U7MM1opk04SuvNjyD
+lsdyLlsPOEi0MMtfgkTaMqqCY9/dtUGrq35zb47An3JQISQcOpUUaSgr+rfNNhr0
+Cmv4KSNLzSklYo0CnfXd1XUK9ibsxp9x7KZILvBDU5h5C1B7CnyO10SBQwX5VJHQ
+sJerVEi+9FNYGku7cSI=
+=lGKo
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.5.0-python3.patch b/dev-python/numpy/files/numpy-1.5.0-python3.patch
new file mode 100644
index 000000000000..c88c70e8fcf9
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.5.0-python3.patch
@@ -0,0 +1,16 @@
+Backport r8689 fixing infinite compile loop with Python3 and GCC-4.5
+
+http://projects.scipy.org/numpy/ticket/1604
+http://bugs.gentoo.org/show_bug.cgi?id=336781
+
+--- numpy/distutils/command/config.py
++++ numpy/distutils/command/config.py
+@@ -271,7 +271,7 @@
+         high = mid
+         # Binary search:
+         while low != high:
+-            mid = (high - low) / 2 + low
++            mid = (high - low) // 2 + low
+             try:
+                 self._compile(body % {'type': type_name, 'size': mid},
+                         headers, include_dirs, 'c')
diff --git a/dev-python/numpy/numpy-1.5.0-r1.ebuild b/dev-python/numpy/numpy-1.5.0-r1.ebuild
deleted file mode 100644
index 0e1e701679fb..000000000000
--- a/dev-python/numpy/numpy-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.0-r1.ebuild,v 1.1 2010/09/09 07:25:31 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
-
-NP="${PN}-1.3"
-
-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/${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 -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}
-	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )
-	doc? ( app-arch/unzip )"
-
-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 ${P}.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
-
-	# 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
-
-	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
-}
-
-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 -q '^ERROR' test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_src_install ${NUMPY_FCONFIG}
-	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
-	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
-}
diff --git a/dev-python/numpy/numpy-1.5.0-r2.ebuild b/dev-python/numpy/numpy-1.5.0-r2.ebuild
index f5cf065c71ba..1a41e59a3e38 100644
--- a/dev-python/numpy/numpy-1.5.0-r2.ebuild
+++ b/dev-python/numpy/numpy-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.0-r2.ebuild,v 1.1 2010/09/10 22:26:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.0-r2.ebuild,v 1.2 2010/09/11 10:24:16 xarthisius Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -66,6 +66,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
 	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
+	epatch "${FILESDIR}"/${P}-python3.patch # 336781
 
 	# Gentoo patch for ATLAS library names
 	sed -i \