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: Sun, 31 Jul 2022 02:42:12
Message-Id: 1659235302.d133f35f892233784f38a3913c6b61c7490a47ad.sam@gentoo
1 commit: d133f35f892233784f38a3913c6b61c7490a47ad
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 02:41:36 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 02:41:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d133f35f
7
8 dev-python/scipy: drop useless IUSE=sparse, fix USE=doc
9
10 Seems to have gone a while ago upstream.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 dev-python/scipy/scipy-1.9.0.ebuild | 18 ++++++++++++++----
15 dev-python/scipy/scipy-1.9.9999.ebuild | 18 ++++++++++++++----
16 2 files changed, 28 insertions(+), 8 deletions(-)
17
18 diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0.ebuild
19 index ccb8c752ed10..61d7f61e799e 100644
20 --- a/dev-python/scipy/scipy-1.9.0.ebuild
21 +++ b/dev-python/scipy/scipy-1.9.0.ebuild
22 @@ -44,16 +44,18 @@ fi
23
24 LICENSE="BSD LGPL-2"
25 SLOT="0"
26 -IUSE="doc +sparse"
27 +IUSE="doc"
28
29 DEPEND="
30 >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
31 sci-libs/arpack:0=
32 virtual/cblas
33 >=virtual/lapack-3.8
34 - sparse? ( sci-libs/umfpack:0= )"
35 -RDEPEND="${DEPEND}
36 - dev-python/pillow[${PYTHON_USEDEP}]"
37 +"
38 +RDEPEND="
39 + ${DEPEND}
40 + dev-python/pillow[${PYTHON_USEDEP}]
41 +"
42 # TODO: restore pythran optionality?
43 BDEPEND="
44 dev-lang/swig
45 @@ -82,3 +84,11 @@ python_test() {
46
47 epytest -n "$(makeopts_jobs)" --pyargs scipy
48 }
49 +
50 +python_install_all() {
51 + use doc && \
52 + local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
53 + local HTML_DOCS=( "${WORKDIR}"/html/. )
54 +
55 + distutils-r1_python_install_all
56 +}
57
58 diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
59 index ccb8c752ed10..61d7f61e799e 100644
60 --- a/dev-python/scipy/scipy-1.9.9999.ebuild
61 +++ b/dev-python/scipy/scipy-1.9.9999.ebuild
62 @@ -44,16 +44,18 @@ fi
63
64 LICENSE="BSD LGPL-2"
65 SLOT="0"
66 -IUSE="doc +sparse"
67 +IUSE="doc"
68
69 DEPEND="
70 >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
71 sci-libs/arpack:0=
72 virtual/cblas
73 >=virtual/lapack-3.8
74 - sparse? ( sci-libs/umfpack:0= )"
75 -RDEPEND="${DEPEND}
76 - dev-python/pillow[${PYTHON_USEDEP}]"
77 +"
78 +RDEPEND="
79 + ${DEPEND}
80 + dev-python/pillow[${PYTHON_USEDEP}]
81 +"
82 # TODO: restore pythran optionality?
83 BDEPEND="
84 dev-lang/swig
85 @@ -82,3 +84,11 @@ python_test() {
86
87 epytest -n "$(makeopts_jobs)" --pyargs scipy
88 }
89 +
90 +python_install_all() {
91 + use doc && \
92 + local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
93 + local HTML_DOCS=( "${WORKDIR}"/html/. )
94 +
95 + distutils-r1_python_install_all
96 +}