summaryrefslogtreecommitdiff
path: root/dev-python/matplotlib
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/matplotlib')
-rw-r--r--dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild (renamed from dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild)3
-rw-r--r--dev-python/matplotlib/matplotlib-2.2.4.ebuild (renamed from dev-python/matplotlib/matplotlib-2.2.4-r1.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
index f8532500675f..a4c0390e0f30 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
index d9582ac4e241..738f51416fb1 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}]