Fix for missing clapack_* symbols in scipy, #371099; thanks Francois Bissey for the patches

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

3 files changed, 142 insertions, 5 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 87bc6bccf371..15aac03b867c 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.70 2011/10/05 19:30:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.71 2011/10/07 15:38:28 jlec Exp $
+
+*scipy-0.9.0-r2 (07 Oct 2011)
+
+  07 Oct 2011; Justin Lecher <jlec@gentoo.org> +scipy-0.9.0-r2.ebuild:
+  Fix for missing clapack_* symbols in scipy, #371099; thanks Francois Bissey
+  for the patches
 
   05 Oct 2011; Justin Lecher <jlec@gentoo.org> scipy-0.9.0.ebuild,
   scipy-0.9.0-r1.ebuild, metadata.xml:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 63743a1ef254..1331bfe687c7 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -13,13 +13,14 @@ DIST scipy-0.9-ref.pdf 5299022 RMD160 38b23f2c32b568d89a4bd02061cf95a0db87a1cf S
 DIST scipy-0.9.0.tar.gz 6084552 RMD160 2aef8c3413ba9c7731d078b27eef1e03419de606 SHA1 a586b10d0613cd61dbfcfd42f3d2609062cd10b8 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23
 EBUILD scipy-0.8.0.ebuild 4166 RMD160 5e3f45d0131da1e8c0dd6c17f308b2732d6a9f78 SHA1 9ff2da693c2eb833c8c2db1efd44c2e773e4fda4 SHA256 db014251fb60a79e789fbf76cbd4ce6b7b554e309badd95f55b4dcb36c1d2c9c
 EBUILD scipy-0.9.0-r1.ebuild 4258 RMD160 b5905f6f89d9042d5d45836d70370c8f05d5042c SHA1 7c0cb80a4c3f1695be0bb0bfdd23ab26738a3f03 SHA256 06c216262f320b85261b7cb686e687f8642438570059ee9a4b8dd7a0783d1f06
+EBUILD scipy-0.9.0-r2.ebuild 3782 RMD160 7e9ba6e5e0a65e5f8295c3b2ca77c996524125fd SHA1 41dd114595380a8f4553f0678d289dd942e8f32d SHA256 f298f2169fad2b7320325468b2e45cb17a109be4d0fa09b54e7593fcbf0203c3
 EBUILD scipy-0.9.0.ebuild 4091 RMD160 bb0e21dea2f099707065037ae13a43b4411f508b SHA1 5c0efbaef685314a54056c376f13269ffeccfb9e SHA256 f666d91d2896c126aa40f98fabced087c3341c2a4215c23f76161a28d43886f1
-MISC ChangeLog 13826 RMD160 0252785c08187d70e2eab9de7740ff03efb6b8a6 SHA1 49f45a1a2fad8ed45babc3cb65c728f7c8dee76b SHA256 6e71db6f8da5207c6a9c4ab568ab38f94c3afeb819fc8d9878284ac081e45ad4
+MISC ChangeLog 14025 RMD160 e5ddf30b4435c54d2c1540f386edf0dc04c0c33c SHA1 78d2b42ea91695b515048cbd993aa94a6b7834e7 SHA256 8da7a3967958aa63cf328b71ff71d67ae0e7b5476309ecf8ae94c712088833b3
 MISC metadata.xml 701 RMD160 7de26e871ba7b2eabf2fc82ba77e4083dc06ec5c SHA1 477a629e4d3a7fa7f5ccdf99e7082a87a2b5f55a SHA256 8f4674ae9fc4197903a15da51e7e4e3674edae1acf06a2db6644a3ae0ce332e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6MsF0ACgkQgAnW8HDreRb0AgCgq9LjwVNgRfxsFKOwY4wwc5Lh
-q0QAnAwkD4E/5/UfjgwO3DziKPL+0Y+B
-=D8Mr
+iEYEAREKAAYFAk6PHPoACgkQgAnW8HDreRYc7gCfcywXwbinyMIxSvEO1Dxmy5kd
+MLsAniLcrAHy9MbCC0IKMVPFQPIOmraf
+=HopK
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.9.0-r2.ebuild b/sci-libs/scipy/scipy-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..c5cf62435dec
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.9.0-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.9.0-r2.ebuild,v 1.1 2011/10/07 15:38:28 jlec Exp $
+
+EAPI="3"
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils fortran-2 distutils flag-o-matic toolchain-funcs versionator
+
+SP="${PN}-$(get_version_component_range 1-2)"
+
+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 -> ${SP}-html.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${SP}-ref.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc umfpack"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	>=dev-python/numpy-1.5
+	media-libs/qhull
+	sci-libs/arpack
+	sci-libs/superlu
+	virtual/cblas
+	virtual/lapack
+	umfpack? ( sci-libs/umfpack )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-arch/unzip )
+	umfpack? ( dev-lang/swig )"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	dev-python/imaging"
+
+# buggy test suite - still true for 0.9.0
+#RESTRICT="test"
+
+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
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${SP}-html.zip -d html || die
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-superlu.patch \
+		"${FILESDIR}"/${P}-qhull.patch
+	rm -rf ./scipy/sparse/linalg/dsolve/SuperLU ./scipy/spatial/qhull
+	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}
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html || die
+		doins  "${DISTDIR}"/${SP}*pdf || die
+	fi
+}
+
+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"
+}