Version bump, removed fortran eclass

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

3 files changed, 131 insertions, 2 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 09d5920ec7e5..870d41d671ca 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.73 2009/04/06 18:17:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.74 2009/04/07 15:22:37 bicatali Exp $
+
+*numpy-1.3.0 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.3.0.ebuild:
+  Version bump, removed fortran eclass
 
   06 Apr 2009; Raúl Porcel <armin76@gentoo.org> numpy-1.0.4-r2.ebuild,
   numpy-1.1.1.ebuild, numpy-1.2.1.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 2e13db8fe6f4..613de2dc848e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
 AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5aad SHA1 e05ed0360a1ac3a980d5b85c536819827c5ca7b7 SHA256 c217b30365c9134482949a5e4a8fdac0577b3205c2d46f30a327323fef5bd1c7
 AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 SHA1 719621772bbb7f4016396081cac1742d15050c01 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073
@@ -5,8 +8,17 @@ AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2
 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
 DIST numpy-1.1.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17 SHA1 a2755f38ca6aa799b504c84f58b03cd6ce66bc41 SHA256 d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
 DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
+DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
 EBUILD numpy-1.0.4-r2.ebuild 3507 RMD160 d9e70b8851cda2adf70aedc9b56d732152a3a69d SHA1 60c8073ce0a9eb72283abe0a0d57b220ffc129e8 SHA256 534b11c0d2d135780581e7adfa06b663b73846f188bce996d0841c0c954432d9
 EBUILD numpy-1.1.1.ebuild 3349 RMD160 27aab3eea2c77ac03c8db40dc6e8116b74f9bfce SHA1 bbff358f0e5536a84c59e6a4906172daf7b16950 SHA256 ead32d70a2c65c81e7840920c6b52b6089b206af76fbce20b588131a819de534
 EBUILD numpy-1.2.1.ebuild 4247 RMD160 4b2510fad74f4a863d17e24bde49f1cd7f2d5819 SHA1 eeffb202ce27df57aacb3981280da2386f1c71ee SHA256 daeca026a8206ab744c574a7d8f0de471c03221f6fff537b5098158f917876b0
-MISC ChangeLog 11089 RMD160 36eed59279fe282037600ebe76ecd98660b2a302 SHA1 8a306eadb24518142df77a475e64ce0beeda108d SHA256 5af40034ef5eb779f74e0ab77afe8521ed179e444d170fb2a4f76a23ce012d91
+EBUILD numpy-1.3.0.ebuild 3570 RMD160 e495d03ca4b5b599c2280294dc3d4fc52b56d98e SHA1 e0c1826cf791d4af29dbeb30c848700a09a73faa SHA256 15540946cf460b4ef5453d8fdc398d07b3506db529b04641f3a4cf38e2e0c7c0
+MISC ChangeLog 11234 RMD160 3512561f2545c80ae18dad7ee757f8103ad4c8b1 SHA1 215c1e7120519a05086241157fb2905a0589ed4f SHA256 a89f991fea9b2414a61e605189ec0bfea5ea7b2dd0dcdea2ef3b69b62c5d0425
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknbb8UACgkQ1ycZbhPLE2CV5wCdHxeHzM9pwB7aoNC1X8SRnjFB
+bDgAnRXMOsmnQEOY0QNAXCj3RsYaWKrJ
+=AMdV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.3.0.ebuild b/dev-python/numpy/numpy-1.3.0.ebuild
new file mode 100644
index 000000000000..59e6f3bb0d23
--- /dev/null
+++ b/dev-python/numpy/numpy-1.3.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.1 2009/04/07 15:22:37 bicatali Exp $
+
+NEED_PYTHON=2.4
+EAPI=2
+inherit eutils distutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast array and numerical python library"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
+HOMEPAGE="http://numpy.scipy.org/"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( dev-util/pkgconfig )
+	test? ( >=dev-python/nose-0.10 )"
+
+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
+	[[ -z ${FC} ]] && FC=$(tc-getFC)
+	# when fortran flags are set, pic is removed.
+	FFLAGS="${FFLAGS} -fPIC"
+	export NUMPY_FCONFIG="config_fc --noopt --noarch"
+}
+
+src_prepare() {
+	# 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() {
+	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 || die
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
+	doman numpy/f2py/f2py.1 || die "doman failed"
+}