From: Rick Farina <zerochaos@gentoo.org>
Date: Mon, 27 Jan 2020 18:14:00 +0000 (-0500)
Subject: dev-python/matplotlib: fixing numpy deps
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=541cd07ad84f501ccb2aacd972ad3bdfdecdaeab;p=gentoo.git

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 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
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 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}]