Migrate to distutils-r1. Backport patch for test failures.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 200 insertions, 6 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 29c9c30c55cc..432d3153951f 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.82 2012/12/13 16:07:11 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.83 2013/02/07 17:00:10 mgorny Exp $
+
+*scipy-0.11.0-r1 (07 Feb 2013)
+
+  07 Feb 2013; Michał Górny <mgorny@gentoo.org>
+  +files/scipy-0.11.0-test_basic.patch, +scipy-0.11.0-r1.ebuild:
+  Migrate to distutils-r1. Backport patch for test failures.
 
   13 Dec 2012; Justin Lecher <jlec@gentoo.org> scipy-0.11.0.ebuild,
   metadata.xml:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 228aaf6d391b..ac1ed2583248 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX scipy-0.11.0-test_basic.patch 1574 SHA256 90b330b9768183b4fe67a92bdd096bada63524163b8812a45e1a21b897a4eecd SHA512 07750651ad123e3e0410a2fb42262f7a6a824926c13429c59ba4e6a60c74ab39d506214b0e149d17fcbd2af40ab970d281db689702bb38096f9e4d9277085770 WHIRLPOOL 9bfd97a2d2e22cfd428781a6696752a01fb6a61fa0fc45bb5bd1c1b27c875c21ba276c75a367f39cb29cbbd3d62415764f1617ff2dddaf9b73bd126e8e5e04c2
 AUX scipy-0.9.0-qhull.patch 1672 SHA256 adbcb54b569c48838df8500a416febbc1f704643874780e4dcf30a635efe6027 SHA512 225392bbce5bb222330955bd12c2c0ae3d12f2dc49d83c11bf8d347490bae0d459fc5e6c858146ebff1fdd767794726fd47ff98426af23fd96f00959d4133293 WHIRLPOOL 9fc2c876207336099d27ef51bcf3638dfe75ddc4c2a95989ae1a1e76f07cdc1b74bc3d24000db5c11590a227063acdba77557dd767c8d49a590d32e87391d69a
 AUX scipy-0.9.0-superlu-4.3.patch 712 SHA256 3078e9b60534571a5765824cb1d5ae1f42497f5a4382f9ae201d59f1cf4dd8d2 SHA512 607c07ab84789aead1060fcd0ccc0d70610cb320f301fa79dab04cfe96e6087914e66282200a435bd9fd9b3be9d1e5025649f553c52af17b91e738f70f78fa07 WHIRLPOOL 696be54c93fdb7ac5addfca188c335cb63721e08cadff267c7f4a41d26d49427e24ab74bfba6cafd77490dd18dec39c5cbda25319f2f89b5ccf04e16a6622cbb
 AUX scipy-0.9.0-superlu.patch 1526 SHA256 10b58353b0cdd6a8a6713ca7186cdb37c33c0ae4e42014322c5ad94465359e8f SHA512 1326cf779bffb9e2046106fd771309a93c3b0d7b15f8200f9a6652b425e7b0b642776feda488d10b2b69f6d16fb9fc1beeae4a1ff57b5e7181b9473c4de07232 WHIRLPOOL ceb430b6cca1036e8c07836b1f6ed71a75a9921bda787973ceb6f46673963d70a0bf07f46fed68d85587208aab51065fdebfce8bcd85d35dfa760fae012098e8
@@ -14,14 +15,17 @@ DIST scipy-0.9-html.zip 8516420 SHA256 6f3148881502ca2cd2964fef7baf9bfec6fe2329e
 DIST scipy-0.9-ref.pdf 5299022 SHA256 ed2641c180eef2f842536a611982fbd91c33c95a7e7e3c279d7ae6f10071be47
 DIST scipy-0.9.0.tar.gz 6084552 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23 SHA512 2c9be17d4f9daea23dab7449282f522641a7bfc0bdb0005631f2a89da44681c4b4e98bdff8b76ee451c1ee36cf3dd2eaf45f670cfaff86c10d49bf5478ac3c43 WHIRLPOOL 0b58a0e0bc03f4759e5bbc3b24b36c6b53092a92c595ca65a79bf307332564b3204fc1d6244bb0a970bdb63f0092591b846cc14e8b4b6c73d9b09ffeb16815b4
 EBUILD scipy-0.10.1.ebuild 3453 SHA256 5d198a8383ef3ae35f68861ef741a9166b4174452bc0a701faea96ec189939b0 SHA512 19e27f4953fc0cebb26c535dab61b1820b01aef6bfc7548f27c07a65f58e9ea40f7083a90a23094da9887118d7c9fe254ca968dcdfc11499d416734c8a88c33d WHIRLPOOL 75c76570585ad81d2c85e0ac27b3a7912cd238470a52c230486a3a00e240140e390378d5d7727584c2cc20c51ac06de8df4223841461d5affe5450afeb7fba34
+EBUILD scipy-0.11.0-r1.ebuild 3564 SHA256 24d1d752eec6beae04ac60d66393408c3ee944a42f7ba3572a6ac665cdc05369 SHA512 ba50de9a2af1a973b9c90d8c41b5b04f71b0aee6ff3966d7371c015b4d0ccf1541ec4b8e00dcffcc0433d63c0cd79cbda2d8b67f5670697ae9689bfdfc8eef2e WHIRLPOOL 92ceb9501827f5042f626096cfef30bad11563979aaebbabbe3dd488943cbd49dae022aaf69420ad24f0c6f46a13e684c3b4dfdf4ea6cc6b5f01a2df50b50cf2
 EBUILD scipy-0.11.0.ebuild 3466 SHA256 5fd72350fbb8f9ef46495071bd0ec350eca5378a47d29c1ebd5b271307949ee6 SHA512 62af91ce719dfb8ac5f67ce9dc9b549882ff9c4c771310ba2f2975b7f227d7c5b7b212b0dbf5c005bdba9460b2cb1fb84519395b5aca1b10e1213b2fb4450566 WHIRLPOOL 8df4594e11ab7ba4919244efb2f2352bc7a78874ab44a2bf64941606781ca9f93c88ecd96f5887006a60f7e29b1d08491bd80be4e72ff31d8177f8d7892e6438
 EBUILD scipy-0.9.0-r1.ebuild 4264 SHA256 2c138cb89cb4f2a467a5fadc1adff2f53614034af4251df048031719058b6fb2 SHA512 bda5d14b38f85ca4cf9da89e02d339139efdd159fb00ed81aa1255edc531bb142c9c1ee9fa58c14edf41e687239613f63a4b31535b3f88bb5fee720227cdd4d3 WHIRLPOOL 205b1be078cb77c5d6ae116ef145e747e24f8e811317290e734782688bcf6203bdc03ff417a11b4edc7ce3c7b68b14b53b926f9ab3f53182b0db095e84f573e0
-MISC ChangeLog 16064 SHA256 6f03855ea3e0a8a526622b8d979de78dfdca0ded9dbd055a56be9ca63f9e88ed SHA512 e5f9f7d1f246cdd84267786655651159f6c306bfabc74669874d23d59ff438c28533bee856d53f29ee30fdfa76f62f27a14693c9effa966e3affdcedc0f85c98 WHIRLPOOL 66243352f0430707795cb24b450279f687ab76a6a2f6663907eb7388955e90fcdb657394b32fbbace237041c4fa28befa988cda97211c5bfd3837b12eeccdee3
+MISC ChangeLog 16275 SHA256 65d4d8d541e2cb3b84fe51e3076c0322bff7c36dda5128e5adb7f38984569680 SHA512 0085f0bf74f83eb5e9a0d3e0aad4902fc2d937accf219f0870226a06f72fb97a81249c5f6d03b60027c0950449bd7f6495aa9e7e42169d1f7feec359ec242113 WHIRLPOOL 41ca71d0622cfb2466d8bd5b976c87387184ea8f5285bb1c1e7bc5fd77654165a7898a2dab53399b1f44f8902975ccb81aa0109d962b2dd583582ba476dc9b9e
 MISC metadata.xml 707 SHA256 7106425fa4d62f2eb36033ca19ec466162b9b748be85571281d5c5d87f2abeb6 SHA512 fc8e90cd7fec46564a1f75c6ba1a8032f24a93e6909b888c62d73a6aad1a10ef140e24fb406ca298271cbcadd7ce2d6ab8977ab9acde98599900e5d6f1d5e644 WHIRLPOOL 4b717b3493e6f3efdfce9f58aef3ad6719590c2ed150f36696086b38ff948e1c32d2bd7f2bd34e77b4e08a1d04182dea12ca90b8627b7cfd55f773ee412e07e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDJ/TAACgkQgAnW8HDreRajtACdGjRFsp5me5RfEEyt9klf03kY
-lBMAnR0JvLZCy2IjGBvLnrhrmzUwnlUU
-=HLAa
+iJwEAQEIAAYFAlET3aAACgkQfXuS5UK5QB2R9AQAiA+23pl/MLfP5iiqccXxGCIn
+E+UbViNw0xhRta9iWJltZjdEoClm43bOCJEdA1lBnVGEkHtmTLaqnkSD3R9REJgA
+BcgCktZP5Aoq1M9xZ6sO3gJNlG+iEW3i6/iJy6nQS7/Z8sQlOivGTxUg4586Bgct
+fgqWT5JnHloGo2rcsSw=
+=qHWI
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/files/scipy-0.11.0-test_basic.patch b/sci-libs/scipy/files/scipy-0.11.0-test_basic.patch
new file mode 100644
index 000000000000..0b1018a3b9c0
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.11.0-test_basic.patch
@@ -0,0 +1,48 @@
+From 6c1cd446bb6c3ffcc131de5b81e21b481400c334 Mon Sep 17 00:00:00 2001
+From: Pauli Virtanen <pav@iki.fi>
+Date: Sat, 3 Nov 2012 17:13:30 +0200
+Subject: [PATCH] TST: special: fix test_basic.py:cephes_vs_amos_mass_test
+
+---
+ scipy/special/tests/test_basic.py |   22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/scipy/special/tests/test_basic.py b/scipy/special/tests/test_basic.py
+index 973322a..6ef4f7f 100644
+--- a/scipy/special/tests/test_basic.py
++++ b/scipy/special/tests/test_basic.py
+@@ -1770,17 +1770,23 @@ def test_iv_cephes_vs_amos_mass_test(self):
+         x = np.random.pareto(0.2, N) * (-1)**np.random.randint(2, size=N)
+ 
+         imsk = (np.random.randint(8, size=N) == 0)
+-        v[imsk] = v.astype(int)
++        v[imsk] = v[imsk].astype(int)
+ 
+-        c1 = special.iv(v, x)
+-        c2 = special.iv(v, x+0j)
++        old_err = np.seterr(all='ignore')
++        try:
++            c1 = special.iv(v, x)
++            c2 = special.iv(v, x+0j)
+ 
+-        # deal with differences in the inf cutoffs
+-        c1[abs(c1) > 1e300] = np.inf
+-        c2[abs(c2) > 1e300] = np.inf
++            # deal with differences in the inf and zero cutoffs
++            c1[abs(c1) > 1e300] = np.inf
++            c2[abs(c2) > 1e300] = np.inf
++            c1[abs(c1) < 1e-300] = 0
++            c2[abs(c2) < 1e-300] = 0
+ 
+-        dc = abs(c1/c2 - 1)
+-        dc[np.isnan(dc)] = 0
++            dc = abs(c1/c2 - 1)
++            dc[np.isnan(dc)] = 0
++        finally:
++            np.seterr(**old_err)
+ 
+         k = np.argmax(dc)
+ 
+-- 
+1.7.10
+
diff --git a/sci-libs/scipy/scipy-0.11.0-r1.ebuild b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..875729614079
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
@@ -0,0 +1,136 @@
+# 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.11.0-r1.ebuild,v 1.1 2013/02/07 17:00:10 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib 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[${PYTHON_USEDEP}]
+	sci-libs/arpack
+	virtual/cblas
+	virtual/lapack
+	umfpack? ( sci-libs/umfpack )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	umfpack? ( dev-lang/swig )"
+
+RDEPEND="${CDEPEND}
+	dev-python/imaging[$(python_gen_usedep python2*)]"
+
+DOCS=( HACKING.rst.txt README.txt THANKS.txt LATEST.txt TOCHANGE.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	pkg-config --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
+}
+
+pc_libdir() {
+	pkg-config --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+pc_libs() {
+	pkg-config --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g'
+}
+
+python_prepare_all() {
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+
+	# 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
+
+	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
+
+	local PATCHES=(
+		"${FILESDIR}"/${P}-test_basic.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	local test_dir="${BUILD_DIR}"/build/tests
+	mkdir -p "${test_dir}" || die
+	local PYTHONPATH=${test_dir}:${PYTHONPATH}
+
+	export PYTHONPATH
+
+	esetup.py install --install-lib="${test_dir}" \
+		--install-scripts="${test_dir}/bin" ${SCIPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -c "
+import scipy, sys
+r = scipy.test('full', verbose=10)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/.
+		dodoc "${DISTDIR}"/${P}*pdf
+	fi
+}
+
+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"
+}