Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/
Date: Fri, 05 Nov 2021 05:14:55
Message-Id: 1636089283.2297995a11f988512633d6b0799e3474a26f0b27.sam@gentoo
1 commit: 2297995a11f988512633d6b0799e3474a26f0b27
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 5 05:14:10 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 5 05:14:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2297995a
7
8 dev-python/scipy: make pythran optional
9
10 Bug: https://bugs.gentoo.org/804115
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-python/scipy/metadata.xml | 1 +
14 dev-python/scipy/scipy-1.7.1.ebuild | 6 ++++--
15 2 files changed, 5 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
18 index 9e4a6eb32f2..0192620473a 100644
19 --- a/dev-python/scipy/metadata.xml
20 +++ b/dev-python/scipy/metadata.xml
21 @@ -18,6 +18,7 @@
22 algorithms, ODE solvers, and others.
23 </longdescription>
24 <use>
25 + <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
26 <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
27 </use>
28 <upstream>
29
30 diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild
31 index b972b925817..ed5e007e4e2 100644
32 --- a/dev-python/scipy/scipy-1.7.1.ebuild
33 +++ b/dev-python/scipy/scipy-1.7.1.ebuild
34 @@ -22,7 +22,7 @@ SRC_URI="
35 LICENSE="BSD LGPL-2"
36 SLOT="0"
37 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
38 -IUSE="doc sparse"
39 +IUSE="doc pythran sparse"
40
41 DEPEND="
42 >=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
43 @@ -36,9 +36,9 @@ BDEPEND="
44 dev-lang/swig
45 >=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
46 dev-python/pybind11[${PYTHON_USEDEP}]
47 - dev-python/pythran[${PYTHON_USEDEP}]
48 virtual/pkgconfig
49 doc? ( app-arch/unzip )
50 + pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
51 test? (
52 dev-python/nose[${PYTHON_USEDEP}]
53 )"
54 @@ -122,6 +122,8 @@ python_prepare_all() {
55 }
56
57 python_configure_all() {
58 + export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
59 +
60 # bug 721860
61 test-flag-FC -fallow-argument-mismatch &&
62 append-fflags -fallow-argument-mismatch