1 |
commit: 1a97fa93304f40cd96c86cdcfeebcf32b1d18646 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 27 18:16:54 2020 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 27 18:18:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a97fa93 |
7 |
|
8 |
sci-libs/scipy: fixing numpy deps |
9 |
|
10 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
12 |
|
13 |
sci-libs/scipy/{scipy-1.1.0.ebuild => scipy-1.1.0-r2.ebuild} | 3 ++- |
14 |
1 file changed, 2 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0-r2.ebuild |
17 |
similarity index 94% |
18 |
rename from sci-libs/scipy/scipy-1.1.0.ebuild |
19 |
rename to sci-libs/scipy/scipy-1.1.0-r2.ebuild |
20 |
index a676281fbac..68223502d2c 100644 |
21 |
--- a/sci-libs/scipy/scipy-1.1.0.ebuild |
22 |
+++ b/sci-libs/scipy/scipy-1.1.0-r2.ebuild |
23 |
@@ -26,7 +26,8 @@ RESTRICT="!test? ( test )" |
24 |
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
25 |
|
26 |
CDEPEND=" |
27 |
- >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}] |
28 |
+ $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*') |
29 |
+ $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*') |
30 |
sci-libs/arpack:0= |
31 |
virtual/cblas |
32 |
virtual/lapack |