| 1 |
commit: cb4ca60fcacda1aed527d57528e3b97d2b078464 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 20:43:25 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 20:54:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4ca60f |
| 7 |
|
| 8 |
dev-python/matplotlib: Revert "fixing numpy deps" |
| 9 |
|
| 10 |
Change done in explicit violation of maintainer's request. |
| 11 |
|
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{matplotlib-2.2.2-r2.ebuild => matplotlib-2.2.2-r1.ebuild} | 3 +-- |
| 15 |
.../matplotlib/{matplotlib-2.2.4-r1.ebuild => matplotlib-2.2.4.ebuild} | 3 +-- |
| 16 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 19 |
similarity index 96% |
| 20 |
rename from dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild |
| 21 |
rename to dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 22 |
index f8532500675..a4c0390e0f3 100644 |
| 23 |
--- a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild |
| 24 |
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 25 |
@@ -41,8 +41,7 @@ PY2_DEPEND=" |
| 26 |
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" |
| 27 |
COMMON_DEPEND=" |
| 28 |
dev-python/cycler[${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/numpy-1.7.1[${PYTHON_USEDEP}] |
| 32 |
dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
| 33 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 34 |
>=dev-python/six-1.10[${PYTHON_USEDEP}] |
| 35 |
|
| 36 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 37 |
similarity index 96% |
| 38 |
rename from dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild |
| 39 |
rename to dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 40 |
index d9582ac4e24..738f51416fb 100644 |
| 41 |
--- a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild |
| 42 |
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 43 |
@@ -39,8 +39,7 @@ PY2_DEPEND=" |
| 44 |
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" |
| 45 |
COMMON_DEPEND=" |
| 46 |
dev-python/cycler[${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/numpy-1.7.1[${PYTHON_USEDEP}] |
| 50 |
dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
| 51 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 52 |
>=dev-python/six-1.10[${PYTHON_USEDEP}] |
Archives