diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-01-27 21:43:25 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-01-27 21:54:44 +0100 |
| commit | cb4ca60fcacda1aed527d57528e3b97d2b078464 (patch) | |
| tree | 63a3a376107105930e2e1e8ffbbcc85dd3c44d18 | |
| parent | sci-libs/scipy: Revert "fixing numpy deps" (diff) | |
| download | gentoo-cb4ca60fcacda1aed527d57528e3b97d2b078464.tar.gz gentoo-cb4ca60fcacda1aed527d57528e3b97d2b078464.tar.bz2 gentoo-cb4ca60fcacda1aed527d57528e3b97d2b078464.zip | |
dev-python/matplotlib: Revert "fixing numpy deps"
Change done in explicit violation of maintainer's request.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -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}] |