Version bump. Unfortunately abandoning our effort unbundling superlu and qhull until upstream fix their issues (bug #364083)

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

3 files changed, 131 insertions, 5 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index d6f7e77cc4ec..cce3b1cd560d 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.75 2012/01/10 16:47:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.76 2012/03/06 22:05:48 bicatali Exp $
+
+*scipy-0.10.1 (06 Mar 2012)
+
+  06 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +scipy-0.10.1.ebuild:
+  Version bump. Unfortunately abandoning our effort unbundling superlu and
+  qhull until upstream fix their issues (bug #364083)
 
   10 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> scipy-0.10.0.ebuild:
   Required dependency on superlu version increased, bug #398289
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 302097fbab4a..d9dcf86263b3 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,18 +7,22 @@ AUX scipy-0.9.0-superlu.patch 1526 RMD160 e9628e30466502aa9f708a082cca02fdf97e6b
 DIST scipy-0.10.0-html.zip 10376099 RMD160 7c93b41f4982388a414d3fea714354d23e57ec44 SHA1 1c07550a6e0fd066d64111c78e26b865ae43bd38 SHA256 cd74fcc447ff353ae9d8b86240ec0f841488c6c53db299a67005a0e10f27c506
 DIST scipy-0.10.0-ref.pdf 6611552 RMD160 905493a2e17a9ab21cf2cfe13d6c14f476514399 SHA1 4e10404b20fae58dcbce48713a1c5f720e840b89 SHA256 e73c654ed3ba799a1897bdc8f1720597ede5ce8381c6acde25203ba70d2181a7
 DIST scipy-0.10.0.tar.gz 6212961 RMD160 4d177c2c185c1ac913902d415e616427976b0a47 SHA1 acb017a4c4ca02a938a2e5a1fedc7dc83e1670c0 SHA256 611f980a29c0139519e70164804340b6945656b79c6d62b83fdbac32ab95fbf8
+DIST scipy-0.10.1-html.zip 14134494 RMD160 0bcbcbd776cd83dad24a714c5b02cd5345ca5c63 SHA1 d7ddf43892d435c8d9b03d268fd46ccd5a36132c SHA256 ae7b19aec1fd5039875b4f493f8ad0258e7cd710c129a126c24cf9a4a8b153b5
+DIST scipy-0.10.1-ref.pdf 8255552 RMD160 bbf8ab988d3ea232a1447f17f6a0c9523bfeed85 SHA1 de5093d960500c0e655ead136cc805ba00400668 SHA256 910c2db682d53418ebbd83164401df7e6d8ac23ec2e1be6b82fd39f61ba96271
+DIST scipy-0.10.1.tar.gz 6231117 RMD160 1c50fe1ab6004197b0808f0a2760220c6a942f8f SHA1 cff0311dfafcc5bc3cacb47cdda8ed6d7c09d691 SHA256 77cc5c48e3f0c07b8137135538cdb99d596d3cc5c498bb0031fb5ff22eae4aa7
 DIST scipy-0.9-html.zip 8516420 RMD160 01dc795021f2a360ac4713bf35619c8a01a1efb1 SHA1 527712601a68abacbfc6d4a4e104a865618d8219 SHA256 6f3148881502ca2cd2964fef7baf9bfec6fe2329ec3f1832e1e6d864aed0f889
 DIST scipy-0.9-ref.pdf 5299022 RMD160 38b23f2c32b568d89a4bd02061cf95a0db87a1cf SHA1 9d1af3044d7e461f3ecb4fb3c00b3e31d1ea4419 SHA256 ed2641c180eef2f842536a611982fbd91c33c95a7e7e3c279d7ae6f10071be47
 DIST scipy-0.9.0.tar.gz 6084552 RMD160 2aef8c3413ba9c7731d078b27eef1e03419de606 SHA1 a586b10d0613cd61dbfcfd42f3d2609062cd10b8 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23
 EBUILD scipy-0.10.0.ebuild 3773 RMD160 38d0b0131200839afa3abbaa8d6beb45eb1e9b10 SHA1 1ab661138dc1552fb221ce1d20cfe32986ec535c SHA256 74d60c13a6e9a6452be3a6b0cbc54496b0cf74f8d193c4f66b776c3e579b9016
+EBUILD scipy-0.10.1.ebuild 3487 RMD160 e19e5043a4110bf3b0f44b9f363ff6407ffe1240 SHA1 2221eb9cc0d040cbeedf57e2fd6293af11256e40 SHA256 dc0d577a26327f80329b6146556891e3fd8ee2433cf5a0444c4b23171b1ab407
 EBUILD scipy-0.9.0-r1.ebuild 4258 RMD160 b5905f6f89d9042d5d45836d70370c8f05d5042c SHA1 7c0cb80a4c3f1695be0bb0bfdd23ab26738a3f03 SHA256 06c216262f320b85261b7cb686e687f8642438570059ee9a4b8dd7a0783d1f06
 EBUILD scipy-0.9.0-r3.ebuild 3832 RMD160 eff59b93fdd1cbd28c4fcc1f27106efa99d000e9 SHA1 6bfb05ffbf0d3de5bbb407d87c9928f9b2a762a4 SHA256 5dd991102118d6bfb959e9d6050713fb3bfab3004be6647a1812f1c237f38691
-MISC ChangeLog 14742 RMD160 d9e18d8f3ae12bd5dda5027afe68944750f90159 SHA1 de8c1b632724ff42c375dc015e1e54bddc7c3761 SHA256 776d7580f10c5c29b032c0ac092d533396ae41281da5a987b8530e383c6b9891
+MISC ChangeLog 14978 RMD160 9c646ead67a99a5f2cd3d80a28f3557a3d668668 SHA1 0b99bce29227d2a373930efb9800d9d5240b17b5 SHA256 eda0a35d9f1c859874fd94ae922f1e1f07dd96bca4f320ec4baef8afae1dc5c1
 MISC metadata.xml 701 RMD160 7de26e871ba7b2eabf2fc82ba77e4083dc06ec5c SHA1 477a629e4d3a7fa7f5ccdf99e7082a87a2b5f55a SHA256 8f4674ae9fc4197903a15da51e7e4e3674edae1acf06a2db6644a3ae0ce332e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8Ma7wACgkQ1ycZbhPLE2BItACdFsX+cjsHTSMlSzgS6sWezD3E
-GikAoIYfhejQpF09+HcZWVDyCnxjFb4S
-=+0cZ
+iEYEARECAAYFAk9WikUACgkQ1ycZbhPLE2CjkwCgrOnUomVvAS4xeLPGZ4FDrZiQ
+hDoAoKaa0cQJ6OwKe+Nal7E2tUFGiiIO
+=Yoj1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.10.1.ebuild b/sci-libs/scipy/scipy-0.10.1.ebuild
new file mode 100644
index 000000000000..01bd9de316d6
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.10.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.1 2012/03/06 22:05:48 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit eutils fortran-2 distutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc test umfpack"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="dev-python/numpy
+	sci-libs/arpack
+	virtual/cblas
+	virtual/lapack
+	umfpack? ( sci-libs/umfpack )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/nose )
+	umfpack? ( dev-lang/swig )"
+
+RDEPEND="virtual/fortran
+	${CDEPEND}
+	dev-python/imaging"
+
+DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use umfpack && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+	python_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
+	fi
+}
+
+src_prepare() {
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF
+		[blas]
+		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}
+		blas_libs = $(pkg-config --libs-only-l \
+			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		[lapack]
+		library_dirs = $(pkg-config --libs-only-L \
+			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
+		lapack_libs = $(pkg-config --libs-only-l \
+			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+	EOF
+}
+
+src_compile() {
+	distutils_src_compile ${SCIPY_FCONFIG}
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
+			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} \
+			|| die "install test failed"
+		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
+		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full')" \
+			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() {
+	distutils_src_install ${SCIPY_FCONFIG}
+	use doc && dohtml -r "${WORKDIR}"/html/* && dodoc "${DISTDIR}"/${P}*pdf
+}
+
+pkg_postinst() {
+	distutils_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"
+}