| 1 |
commit: 541cd07ad84f501ccb2aacd972ad3bdfdecdaeab |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 18:14:00 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=541cd07a |
| 7 |
|
| 8 |
dev-python/matplotlib: 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 |
.../{matplotlib-2.2.2-r1.ebuild => matplotlib-2.2.2-r2.ebuild} | 3 ++- |
| 14 |
.../matplotlib/{matplotlib-2.2.4.ebuild => matplotlib-2.2.4-r1.ebuild} | 3 ++- |
| 15 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild |
| 18 |
similarity index 96% |
| 19 |
rename from dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 20 |
rename to dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild |
| 21 |
index a4c0390e0f3..f8532500675 100644 |
| 22 |
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 23 |
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild |
| 24 |
@@ -41,7 +41,8 @@ PY2_DEPEND=" |
| 25 |
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" |
| 26 |
COMMON_DEPEND=" |
| 27 |
dev-python/cycler[${PYTHON_USEDEP}] |
| 28 |
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] |
| 29 |
+ $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*') |
| 30 |
+ $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*') |
| 31 |
dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
| 32 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 33 |
>=dev-python/six-1.10[${PYTHON_USEDEP}] |
| 34 |
|
| 35 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild |
| 36 |
similarity index 96% |
| 37 |
rename from dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 38 |
rename to dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild |
| 39 |
index 738f51416fb..d9582ac4e24 100644 |
| 40 |
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 41 |
+++ b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild |
| 42 |
@@ -39,7 +39,8 @@ PY2_DEPEND=" |
| 43 |
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" |
| 44 |
COMMON_DEPEND=" |
| 45 |
dev-python/cycler[${PYTHON_USEDEP}] |
| 46 |
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] |
| 47 |
+ $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*') |
| 48 |
+ $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*') |
| 49 |
dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
| 50 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 51 |
>=dev-python/six-1.10[${PYTHON_USEDEP}] |
Archives