diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2020-01-27 13:14:00 -0500 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2020-01-27 13:18:16 -0500 |
| commit | 541cd07ad84f501ccb2aacd972ad3bdfdecdaeab (patch) | |
| tree | a797ba1b15a121d7ca0ae8e488f0a4921336a3d4 | |
| parent | net-misc/whatmask: EAPI=7 (diff) | |
| download | gentoo-541cd07ad84f501ccb2aacd972ad3bdfdecdaeab.tar.gz gentoo-541cd07ad84f501ccb2aacd972ad3bdfdecdaeab.tar.bz2 gentoo-541cd07ad84f501ccb2aacd972ad3bdfdecdaeab.zip | |
dev-python/matplotlib: fixing numpy deps
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
| -rw-r--r-- | dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild (renamed from dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild) | 3 | ||||
| -rw-r--r-- | dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild (renamed from dev-python/matplotlib/matplotlib-2.2.4.ebuild) | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild index a4c0390e0f30..f8532500675f 100644 --- 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 index 738f51416fb1..d9582ac4e241 100644 --- 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}] |