Version bump. Better compatibility with python-2.6.

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

3 files changed, 118 insertions, 6 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index d238bb1c116b..24080ade952f 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.41 2009/02/20 10:29:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.42 2009/07/21 21:40:03 bicatali Exp $
+
+*scipy-0.7.1 (21 Jul 2009)
+
+  21 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +scipy-0.7.1.ebuild:
+  Version bump. Better compatibility with python-2.6.
 
   20 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
   scipy-0.6.0-r6.ebuild, scipy-0.7.0.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index e2cb9f3dd624..b91619f5143c 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -11,14 +11,16 @@ AUX scipy-0.6.0-stsci.patch 2209 RMD160 c7c21a23aef7fff9318f224ef2383f7970c1caf9
 AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562fc241300 SHA1 40239fd3a77dc6f8cf9914a266953fd7b4ef41fe SHA256 cbde48ba3e22ef994b4ae0744c6186ef6d3ec608a74b3d0082f22d0be9591b96
 DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b SHA1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f
 DIST scipy-0.7.0.tar.gz 4636167 RMD160 3583901f679cbc7f91560626f437d7edcd2bf6cf SHA1 7daef781253bafccf3be54b9eb3541f084503076 SHA256 fd788317cee1cd3be91699d88c813ad0d1190131851b04b025ac20a27b60467c
+DIST scipy-0.7.1.tar.gz 4538765 RMD160 b3cb0b40a739cd8b61182f123581d57443b9401a SHA1 ab637e29743cc0c42903a8815043f85d13fb9e42 SHA256 08830d6363a8753ca1376dd22da86d164902711c5feaf0f768b5ee086b3ecd5f
 EBUILD scipy-0.6.0-r6.ebuild 4218 RMD160 04d4f4fd46c0ce2ceb33f6e838c421cf902c7318 SHA1 7a633ba12f69f25cecbb3acbf1a1f8c98c54ba4e SHA256 4226fbd68fa3311aa6f1cfb51b1c18c85559405f2eb1c487711d5040d3c92bd4
 EBUILD scipy-0.7.0.ebuild 3495 RMD160 78385941029724181ada0f03a81320056d633178 SHA1 1e071c89ee0a41ad0069a537557f384edc256590 SHA256 bf13a122f21b64427843afb97180b390657d6e0ca7badafa15d493147cec67db
-MISC ChangeLog 9243 RMD160 7b81f64e216da3afc4210f6cd0ece3c89002d91a SHA1 560b4e3671405cff79db273de84b470d849c6ba5 SHA256 bbaf463651638fe3ec212766f56e6542b6f98a9e6059324df0c1b929c79b6884
+EBUILD scipy-0.7.1.ebuild 3069 RMD160 df45af91ea3bf6b9cd3d611c930e0baf5c20342e SHA1 e809434f1c0feaa9dffdb3c832f7579d41039cf3 SHA256 5ddeff2afa831049c64381433b86f3b00f74e296b20ebc71b75f2a97dd4f19c7
+MISC ChangeLog 9402 RMD160 ab40b0c4f18e98dcf30db5c6838ef2bf2e1557e7 SHA1 01a727eab3f3cf7d60b0504a57158cf8ff95aa0f SHA256 47b6ad244610e09636f30eeedc0d6f1aee758ae90b34c4e0869d2bf86e197fb0
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmehlAACgkQ1ycZbhPLE2CobgCeKRLChFMtBlKew/yTxpxCIhbQ
-kQ0An3sjQ+7Z7426L+OtYrRvGyC1kEyG
-=L3If
+iEYEARECAAYFAkpmNb0ACgkQ1ycZbhPLE2DLDACffvM5nQS5QfRtfLCuPkAhPbLr
+cmQAniv0G67yCHD7lrdDM4ThcBgefy7x
+=zP3c
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
new file mode 100644
index 000000000000..e78e77718bd0
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.7.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.1 2009/07/21 21:40:03 bicatali Exp $
+
+EAPI=2
+NEED_PYTHON=2.4
+
+inherit eutils distutils toolchain-funcs flag-o-matic
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="http://www.scipy.org/"
+LICENSE="BSD"
+
+SLOT="0"
+IUSE="test umfpack"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND=">=dev-python/numpy-1.2
+	virtual/cblas
+	virtual/lapack
+	umfpack? ( sci-libs/umfpack )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	test? ( dev-python/nose )
+	umfpack? ( dev-lang/swig )"
+
+RDEPEND="${CDEPEND}
+	dev-python/imaging"
+
+# buggy tests
+RESTRICT="test"
+
+DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
+
+pkg_setup() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use umfpack && unset UMFPACK
+	append-ldflags -shared
+	[[ -z ${FC} ]] && FC=$(tc-getFC)
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
+	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
+	cat > site.cfg <<-EOF
+		[DEFAULT]
+		library_dirs = /usr/$(get_libdir)
+		include_dirs = /usr/include
+		[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
+}
+
+src_compile() {
+	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
+	distutils_src_compile ${SCIPY_FCONFIG}
+}
+
+src_test() {
+	"${python}" setup.py install \
+		--home="${S}"/test \
+		--no-compile \
+		${SCIPY_FCONFIG} || die "install test failed"
+	pushd "${S}"/test/lib*/python
+	PYTHONPATH=. "${python}" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
+	grep -q ^ERROR test.log && die "test failed"
+	popd
+	rm -rf test
+}
+
+src_install() {
+	distutils_src_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer if you don't like the default one. Ex:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}