sci-libs/scipy: Fix for linking with mkl, #493318

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 162 insertions, 6 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index f7af8ba10a2b..27425215854c 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.110 2013/12/22 18:15:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.111 2013/12/26 20:52:20 jlec Exp $
+
+*scipy-0.13.2-r1 (26 Dec 2013)
+
+  26 Dec 2013; Justin Lecher <jlec@gentoo.org> +scipy-0.13.2-r1.ebuild:
+  Fix for linking with mkl, #493318
 
 *scipy-0.13.2 (22 Dec 2013)
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 775386fe8cfe..d7bf699ce3b7 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912ed2e22065a7de02b85c8a269 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c WHIRLPOOL ec00c2778e5e31a5d0ec4bc8099b4579e4eaa34a335653155da3c47e3c69fb3a8ff67b816cbeb769b81826c27ca687fc9fc22db11b91ddfadb6268c98890b302
 AUX scipy-0.12.0-cephes-missing-include.patch 394 SHA256 0263ba4e9f13c7be0e7160ae73ce98ea37f698ea7e06c3fc090bc4ff7732bc66 SHA512 a4f9adf9b29743b6ca7f42de0695af23ddf7791330a4a58a2f47cd5599af1361aee3b141a016ea1a81a3bc5b8bfcaa3f0478370a09acd37bcd8e519765701510 WHIRLPOOL 59651015bf540ad2218dd65764d68fb5f2b907116245e3e83d14084579314af6c58c34be3f74300166c2450e00833fa4ae6d6de057392d3e947a979555add1bc
@@ -18,13 +18,24 @@ DIST scipy-0.13.2.tar.gz 10144409 SHA256 485f194c7fe46da92e63bff524346ccaed4040c
 EBUILD scipy-0.12.1.ebuild 3794 SHA256 aa1a59f045d86e2cb7016682ea841913bb8429b87a3095a7a00ce3f75b2c48d8 SHA512 856b8b23e6a8ab3efb6526e7cc94b8eb742d04cfa1e460ee9364265743d655cfed4cbb296d41c07ccae3dc4d3945f41a53e0307b87a740b4b7f3fbae6d161f1f WHIRLPOOL d837a98eabb2e5feb143d94790f79c622ab8eba6f4d868bfa2bb0f010af29460389d7d46d6d2be5d11b679624540f87fb8f93a9f69982824397703d0dec4e9e0
 EBUILD scipy-0.13.0.ebuild 3619 SHA256 f934647eceef2c326878d31bdf9289ca86726ed1ced5f29568df1935ba6a37f1 SHA512 370aa07dba0e61fe23dc57a33cb460058cfa1708a5d2e21dc7bb41cdfa7bb987e71281ab16dca0e056e1192cf6e69653e689eb5aa87231bbe105544ff69c2f93 WHIRLPOOL 300028a9c33c9010650dfd12437ec9b5e0ccb44b5404b20b2ec897ea4d15dceabf4d2ff89678c90ba567847581d4c03ea12524193ccbff63bc1c3a83421a77ce
 EBUILD scipy-0.13.1-r2.ebuild 3788 SHA256 83773fbd8dc2906d2e809378e45f939d88211785f12014db26cc34e8adc7aa24 SHA512 1a48a5ee02b1c53860cd9afd53d78e2f115ec92b431053f8ebb3de74c13e8aa1a52fbff33d57043390b70aa64171f0f5035f23e0a1a333cb0d15bc2f11284c0c WHIRLPOOL 18333f4e53ac4a88355b4bb4a02cd1a3eb22d3d312ace1aa26e2f07eeefd5cfa03113ef1cd01a2ed85798b5e28a017a4c54ac80bed12652ccf33b1e4c005a05d
+EBUILD scipy-0.13.2-r1.ebuild 3856 SHA256 fe6cb1e6fd7a8dafe8bbc0d8158ef5d7ba4ee4d8c7d1a5d095a3f5e010465f11 SHA512 fadf57e152b9ba2b8ad0b08274d2c0e9ddd9044aaa8e64e1ed1d3a76ce092d776c55876d72b75a4d2c0fb1e34e6f931cf9f074a44fdbab13d1cf3ac21fcbdffe WHIRLPOOL 07c78c273d806476e9bc0d56adaae39b13bbc495d622a8d88f81580650cc73754f7bf2170d864c8504d012cc90e2cd1a485f13f84c999b7d7b82345c73cca459
 EBUILD scipy-0.13.2.ebuild 3821 SHA256 7fbd1d0be83c47969d44a79eab7b5d5045d4fc02633e038a7ce870a782c3aca8 SHA512 4a9a5a14d1386dfdf46dc1701508b0be052ab9b6cf05e7972689d6842808491eb952cf2269fcf926aec8664ed40953fe11f62b3bfb5f2bc9dc940d60681a642d WHIRLPOOL 45018cacda91ce0f7ea2692994ea6e608fa7996a6f92e6eb8f73c0bd4f29d42fe0e3c4efc1d60cd3fddc082f961695a4706bfdcf6caac3a693b4657c76cf4346
-MISC ChangeLog 20024 SHA256 19d639863756b18d88933a35f552ea3bec9d4df1374c3a189680de0a828c8b66 SHA512 585251fb22eedc7a87d118ff8b1d4a2270aabd6a98eda1338da5506d069d820fc32169e395a2c4321d30d0b6dccac04cc1c5c0362e4fc278789f7e57ecd21db2 WHIRLPOOL 8f61a9a51717adb6c0e6090ae80d23252528ff15531a18fb5a614baaea6416ad50389b1eb39207bfdd9c2276cfec25f92bd9a2349daba393237c3b99f0d2bb8e
+MISC ChangeLog 20161 SHA256 7a2772fc74b450cab8756c67bbae10b8023e476361438d42b248e4e594546b0c SHA512 51cfa54b78279a12721e393579dba593a783c794f900497cdd9dd43602a9d011ded3f994e040131cb590ea1d6b5baedfc450c6681b124b893f93651971ac64f0 WHIRLPOOL 580097342b13b9383d983456c64c6f61cc22adddee586b700073cf49b0b61fbfbddd8cab1dc62c1f77a19ca37bec331bc8e5d7e7e9532bc9d482e8f3849a1dd3
 MISC metadata.xml 778 SHA256 c585563656be41d539826dbd6ac5f633a0704b73a39b3603b50ce6092d767e73 SHA512 da239d303a88f7bc4356a27965aed91befd379ee142c529ab5177276eb86ac7976b527a2b1397584754f1cec1c6743c98b9af4a540e6cc503607ac3cf529de06 WHIRLPOOL e04375da88108229b3386ae79ba452705a4d4fcdbff9f38c491a4436846c9037d8c68bd8d5524d5435e351a557bd604211477a28da5661c9cce804fe27a34b2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3LC4ACgkQ1ycZbhPLE2A0hgCgqZY5K+N1ZXLOVgSEgNtp4AUi
-gWMAn3kYr0FRxDzvBlGFfc4U84jvgfql
-=WLOw
+iQIcBAEBCgAGBQJSvJcFAAoJELnU8jG9FVirB+AP/jBF7fbS/ebylN8qNl/gg2vW
+jMTBEwgOO6Ixxa5UC2h02f811rdgNGnYfW6+aYl+JstAZgqs0mImF+j/wsG+LoZk
+NjJ2aXBis4WUop/OLSy00Aj/FhexwF+1ug4Ta7mVFRphwe2ERxK6JPPOLWuVzI1C
+AtWoQOk/9PGYGbQmbVqO8T+x2G10HF7CcMqWAg/OeARrsllH9ryIehyz+9M6CfTE
+2d7jcQWnrr67uivLVXSTiNnVGBpnvkJw2CZsgvb65OfZTRlFwL0fMIzaaCtMGq+z
+W95AC99Tp+YxnzGAcgEGb2+7Y3pM6eeeZZtXiWY6MKgCFS+lqVF1JQgSaR3xhs8v
+7Z9H63zCSd/yXkosGzkfpBZi+kZnkIEavpskWbulv8GmEiZYFQjhx4SB7d+Om13r
+KLHRPWlTA4h7sq4a3QxN5Xe02SKplil6X7BxPyzAi+JzmFtwkPGeQEYEH3coEEc8
+f5lG9CJz0MjUNR8+OcXK4/Y7fq0SVRNBsSA8y0kao/LlSJSPbuwqYA1qNz1NQqYo
+S4M4DisUXZ/9Isim2HxFIfCCKVhkA2av/euq4PY2+wr4/kUGYw0cG5SQmogGe82G
+el0/Hw312vqGo/lMRV5ESuO303GdcpxHNGiNYAJEWz8Yj88v2hhJT4SwmM7nE788
+N3gok2L9tAiY9VXHS386
+=GX9b
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.13.2-r1.ebuild b/sci-libs/scipy/scipy-0.13.2-r1.ebuild
new file mode 100644
index 000000000000..348af206e78e
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.13.2-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.2-r1.ebuild,v 1.1 2013/12/26 20:52:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="http://www.scipy.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-html.zip -> ${PN}-0.13.0-html.zip
+		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-ref.pdf -> ${PN}-0.13.0-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/mpmath[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${CDEPEND}
+	virtual/python-imaging[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-0.13.0-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| sort | uniq | tr '\n' ','
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && 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
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
+		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast',verbose=2)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/.
+		dodoc "${DISTDIR}"/${PN}*pdf
+	fi
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}