1 |
commit: 1502e5e3459b31dc6400f6fe71a62ef4f5b5db10 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 02:52:57 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 02:52:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1502e5e3 |
7 |
|
8 |
dev-python/scipy: depend on umfpack |
9 |
|
10 |
Some of the logic got gutted (hence what I said in d133f35f892233784f38a3913c6b61c7490a47ad) |
11 |
but it still automagically uses umfpack if it can. |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-python/scipy/{scipy-1.9.0.ebuild => scipy-1.9.0-r1.ebuild} | 4 +++- |
16 |
dev-python/scipy/scipy-1.9.9999.ebuild | 4 +++- |
17 |
2 files changed, 6 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0-r1.ebuild |
20 |
similarity index 94% |
21 |
rename from dev-python/scipy/scipy-1.9.0.ebuild |
22 |
rename to dev-python/scipy/scipy-1.9.0-r1.ebuild |
23 |
index 61d7f61e799e..888ff2073ebb 100644 |
24 |
--- a/dev-python/scipy/scipy-1.9.0.ebuild |
25 |
+++ b/dev-python/scipy/scipy-1.9.0-r1.ebuild |
26 |
@@ -46,9 +46,11 @@ LICENSE="BSD LGPL-2" |
27 |
SLOT="0" |
28 |
IUSE="doc" |
29 |
|
30 |
+# umfpack is technically optional but it's preferred to have it available. |
31 |
DEPEND=" |
32 |
>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] |
33 |
- sci-libs/arpack:0= |
34 |
+ sci-libs/arpack:= |
35 |
+ sci-libs/umfpack |
36 |
virtual/cblas |
37 |
>=virtual/lapack-3.8 |
38 |
" |
39 |
|
40 |
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild |
41 |
index 61d7f61e799e..888ff2073ebb 100644 |
42 |
--- a/dev-python/scipy/scipy-1.9.9999.ebuild |
43 |
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild |
44 |
@@ -46,9 +46,11 @@ LICENSE="BSD LGPL-2" |
45 |
SLOT="0" |
46 |
IUSE="doc" |
47 |
|
48 |
+# umfpack is technically optional but it's preferred to have it available. |
49 |
DEPEND=" |
50 |
>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] |
51 |
- sci-libs/arpack:0= |
52 |
+ sci-libs/arpack:= |
53 |
+ sci-libs/umfpack |
54 |
virtual/cblas |
55 |
>=virtual/lapack-3.8 |
56 |
" |