[gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/

[Michał Górny]

commit:     cb4ca60fcacda1aed527d57528e3b97d2b078464
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 20:43:25 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 20:54:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4ca60f

dev-python/matplotlib: Revert "fixing numpy deps"

Change done in explicit violation of maintainer's request.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{matplotlib-2.2.2-r2.ebuild => matplotlib-2.2.2-r1.ebuild}         | 3 +--
 .../matplotlib/{matplotlib-2.2.4-r1.ebuild => matplotlib-2.2.4.ebuild} | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild 
b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index f8532500675..a4c0390e0f3 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -41,8 +41,7 @@ PY2_DEPEND="
        $(python_gen_cond_dep 
'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
 COMMON_DEPEND="
        dev-python/cycler[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] 
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
-       $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 
'python3*')
+       >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
        dev-python/python-dateutil:0[${PYTHON_USEDEP}]
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/six-1.10[${PYTHON_USEDEP}]

diff --git a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild 
b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.4.ebuild
index d9582ac4e24..738f51416fb 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -39,8 +39,7 @@ PY2_DEPEND="
        $(python_gen_cond_dep 
'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
 COMMON_DEPEND="
        dev-python/cycler[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] 
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
-       $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 
'python3*')
+       >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
        dev-python/python-dateutil:0[${PYTHON_USEDEP}]
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/six-1.10[${PYTHON_USEDEP}]