Force numpy to use GNU compilers for linking when FC is set to gfortran, wrt bug 335908. Drop old.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

4 files changed, 15 insertions, 151 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b13d6cb81b2b..2bfc5ac18363 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2010/09/02 13:25:02 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.117 2010/09/09 07:25:31 xarthisius Exp $
+
+*numpy-1.5.0-r1 (09 Sep 2010)
+
+  09 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> -numpy-1.2.1.ebuild,
+  -numpy-1.5.0.ebuild, +numpy-1.5.0-r1.ebuild:
+  Force numpy to use GNU compilers for linking when FC is set to gfortran,
+  wrt bug 335908. Drop old.
 
 *numpy-1.5.0 (02 Sep 2010)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 3f0d6d034ba2..ec14d12aad44 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,17 +5,15 @@ 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
-DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
 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
 DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
 DIST numpy-1.4.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6 SHA1 ec6078aa09acbcca3d90f9f36353fc83e7e1daa0 SHA256 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06
 DIST numpy-1.5.0.tar.gz 2276377 RMD160 6c6a8ce32d32705b66966c7a58359a0f2f404549 SHA1 5e3c40e1dde20bd8fda7a2131cb1259af7689295 SHA256 06d2181c884c5937c7c475103dd55de4fe4842a9d91bab1ed0965dd973a4661a
-EBUILD numpy-1.2.1.ebuild 4240 RMD160 749cdd64719a84cef6c2885009edd25664fbeeab SHA1 67c6a066ae5d97c394b904aa04e09eec36e41483 SHA256 81dfa92b729856475cc7dc8a29c6f8c1154e309b783f2543f48c61f6911a58b7
 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.ebuild 4623 RMD160 75f44412f06549fb014cdea30a070a42cc4dc332 SHA1 31e05cf081da6c7e857e0fcdd0e372955c2d6a3b SHA256 aa56a999fda21c671601dc0b64d29e27eadd6061e45d5694199b6f98dc8e7fa4
-MISC ChangeLog 16728 RMD160 a499dd3c2ca6a5b023e271939c33e856760041cd SHA1 7c761922bb591625e8ab7f84e61da822ce91532d SHA256 596786776304ce5446731ef31337b83d2f69f3f4e380cbb3b54b75a6767cab16
+EBUILD numpy-1.5.0-r1.ebuild 4754 RMD160 2c77735b4550fee87182134a26e2e3142f15958e SHA1 58e40da8db02d31d669ccfbb8c6cae99762f1352 SHA256 e4ecd71eecc4cf500713181a238cc3ab33b30f38e58ad6d1d49deb22c724eb8d
+MISC ChangeLog 16992 RMD160 cb8a28665863b67c0f22e914978ae8271b671cf9 SHA1 9e5a42110f095785858eca9c5df791f3f0f5c75c SHA256 44792514cb040a5085d8c762f0b3a86044b98ed6d42bd5ea441777b80e06f6db
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
diff --git a/dev-python/numpy/numpy-1.2.1.ebuild b/dev-python/numpy/numpy-1.2.1.ebuild
deleted file mode 100644
index 9af236bd6105..000000000000
--- a/dev-python/numpy/numpy-1.2.1.ebuild
+++ /dev/null
@@ -1,144 +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.2.1.ebuild,v 1.16 2010/06/30 01:59:25 arfrever Exp $
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils flag-o-matic fortran
-
-DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://numeric.scipy.org/"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-0.10 )
-	lapack? ( dev-util/pkgconfig )"
-
-IUSE="lapack test"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-LICENSE="BSD"
-
-# whatever LDFLAGS set will break linking
-# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
-if [ -n "${LDFLAGS}" ]; then
-	append-ldflags -shared
-else
-	LDFLAGS="-shared"
-fi
-
-pkg_setup() {
-	# 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
-	FORTRAN="gfortran g77 ifc"
-	fortran_pkg_setup
-	local fc=
-	case ${FORTRANC} in
-		gfortran) fc=gnu95 ;;
-		g77) fc=gnu ;;
-		ifc|ifort)
-			if use ia64; then
-				fc=intele
-			elif use amd64; then
-				fc=intelem
-			else
-				fc=intel
-			fi
-			;;
-		*) eerror "Unknown fortran compiler: ${FORTRANC}"
-		   die "numpy_fortran_setup failed" ;;
-	esac
-
-	# when fortran flags are set, pic is removed.
-	use amd64 && FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix some paths and docs in f2py
-	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.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
-		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'):/usr/$(get_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'):/usr/$(get_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'):/usr/$(get_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
-}
-
-src_compile() {
-	# when fortran flags are set, pic is removed but unfortunately needed
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	"${python}" setup.py ${NUMPY_FCONFIG} install \
-		--home="${S}"/test \
-		--no-compile \
-		|| die "install test failed"
-	pushd "${S}"/test/lib*
-	PYTHONPATH=python "${python}" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-	grep -q '^ERROR' test.log && die "test failed"
-	popd
-	rm -rf test
-}
-
-src_install() {
-	distutils_src_install ${NUMPY_FCONFIG}
-	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${D}"/usr/lib/python*/site-packages/numpy/*.txt
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	if  ! built_with_use sys-devel/gcc fortran &&
-		! has_version dev-lang/ifc
-	then
-		ewarn "To use numpy's f2py you need a fortran compiler."
-		ewarn "You can either set USE=fortran flag and re-install gcc,"
-		ewarn "or install dev-lang/ifc"
-	fi
-}
diff --git a/dev-python/numpy/numpy-1.5.0.ebuild b/dev-python/numpy/numpy-1.5.0-r1.ebuild
index 751eabf345f6..0e1e701679fb 100644
--- a/dev-python/numpy/numpy-1.5.0.ebuild
+++ b/dev-python/numpy/numpy-1.5.0-r1.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.ebuild,v 1.1 2010/09/02 13:25:02 djc Exp $
+# $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"
@@ -47,7 +47,10 @@ pkg_setup() {
 	[[ -z ${FC} ]] && FC=$(tc-getFC)
 	# when fortran flags are set, pic is removed.
 	FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --noopt --noarch"
+	NUMPY_FCONFIG="config_fc --noopt --noarch"
+	# workaround bug 335908
+	[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG="${NUMPY_FCONFIG} --fcompiler=gnu95"
+	export NUMPY_FCONFIG
 }
 
 src_unpack() {