dev-python/matplotlib: fixing numpy deps

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Rick Farina <zerochaos@gentoo.org>

diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
index a4c0390e0f3015804f8edf088b4be9b896a562d2..f8532500675f08273aef5efd2d864dc0afcf731d 100644 (file)
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
@@ -41,7 +41,8 @@ PY2_DEPEND="
        $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
 COMMON_DEPEND="
        dev-python/cycler[${PYTHON_USEDEP}]
-       >=dev-python/numpy-1.7.1[${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/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.ebuild b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.4.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
index 738f51416fb1699c9d6d62d5485ef178b4e1ef9e..d9582ac4e2417adba0e2c7d41662699e4042dca6 100644 (file)
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
@@ -39,7 +39,8 @@ PY2_DEPEND="
        $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
 COMMON_DEPEND="
        dev-python/cycler[${PYTHON_USEDEP}]
-       >=dev-python/numpy-1.7.1[${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/python-dateutil:0[${PYTHON_USEDEP}]
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/six-1.10[${PYTHON_USEDEP}]