Version bump

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 165 insertions, 2 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index c1224fa97426..17afb1b39dcb 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.67 2008/10/01 09:15:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.68 2008/11/06 00:04:43 bicatali Exp $
+
+*numpy-1.2.1 (06 Nov 2008)
+
+  06 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.2.1.ebuild:
+  Version bump
 
   01 Oct 2008; Raúl Porcel <armin76@gentoo.org> numpy-1.2.0.ebuild:
   Add ~alpha wrt #233554
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 92efcad65048..8981c7a96205 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.0.tar.gz 1425633 RMD160 614a0cb92eed89698e2cc94447d0514ad07976b5 SHA1 70c0432ad9a6bb1006158f9aac2d1cfe5ac885c2 SHA256 13cfa68706a698dd8497755fe2154f406399a6a6d9828a253b3c767c04806d55
+DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
 EBUILD numpy-1.0.4-r2.ebuild 3513 RMD160 5c08ca6bc74d5e23d4371e30397b07e8edf4bb7b SHA1 2e6762776bbd748eded9be93066f1db6dfe9d0d3 SHA256 f5ac672a2275d826bc5c2e117c79cc739299e65023955aa9a8b04e8a7368c45a
 EBUILD numpy-1.1.1.ebuild 3354 RMD160 f85bbed92966a39bac53c17af1401d1375d92727 SHA1 ed3cca163f989afa90cd619bc11fb2c118f5a04a SHA256 374eee70f651b6ee2714493b12d8581f85766b654d1b333f52be5e8755e0ac48
 EBUILD numpy-1.2.0.ebuild 4216 RMD160 32c42ddb2f2f66e3feb531be537ea7187a653613 SHA1 fcd735e8b809c373604ed947ed2a953223e7fb10 SHA256 2e12e96cab843930d8ec2d1d60c2ba26007760ff1e152a464403c018ecacbbfe
-MISC ChangeLog 10248 RMD160 22fff1a92231645e98cce270feee9aa03bfbcb49 SHA1 b91fe8ebd5db9956c16ab03226662d9e456525ff SHA256 099bfba60988d782e0b7f6818e5130cd7c9a845ab8343fde261c2f2a1c4beee3
+EBUILD numpy-1.2.1.ebuild 4217 RMD160 ba29be5ecd852e43b72a2cc7904ef3fdc3e3055e SHA1 ae84fe56fe15a77b952d00254748d3e12ae4a265 SHA256 0c5a47e082e3cb21e478bd7d607a86856bcad393977c610adf3277910d83ac2a
+MISC ChangeLog 10369 RMD160 bd67e3a1583edf378426b02abc02568c620e1957 SHA1 afba677ab86a1c7814d06f3a092192634ba2a96f SHA256 2e9dd7056b116f4f93507042b8a4489e7e111860c9bc39f98673e5b234ed65bc
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkSNKYACgkQ1ycZbhPLE2AV9gCdEmMhojnW+gUjD09SXRt9N8hr
+bTUAn0c3p6H/Lf6EMR+ATB1HUY5t/M+g
+=By19
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.2.1.ebuild b/dev-python/numpy/numpy-1.2.1.ebuild
new file mode 100644
index 000000000000..6e2e2019b8b3
--- /dev/null
+++ b/dev-python/numpy/numpy-1.2.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 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.1 2008/11/06 00:04:43 bicatali Exp $
+
+NEED_PYTHON=2.4
+
+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="!dev-python/f2py
+	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 ~hppa ~ia64 ~sparc ~x86"
+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 lapack | sed -e 's/^-I//' -e 's/ -I/:/g')
+			library_dirs = $(pkg-config --libs-only-L \
+				cblas lapack | sed -e \
+				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
+			atlas_libs = $(pkg-config --libs-only-l \
+				cblas | 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 | sed -e 's/^-L//' -e 's/ -L/:/g' \
+				-e 's/ //g'):/usr/$(get_libdir)
+			libraries = $(pkg-config --libs-only-l \
+				cblas | 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
+}