From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 19:12:46 +0000 (+0100)
Subject: sci-visualization/pythonprop: Switch to PYTHON_MULTI_USEDEP API
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=86318134b18dd16cd10a67e1986594556181da43;p=gentoo.git

sci-visualization/pythonprop: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
index 854920aa56a8..729017cea4fc 100644
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| (
-		dev-python/matplotlib-python2[gtk2,${PYTHON_USEDEP}]
-		dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
-	)
-	dev-python/basemap[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/matplotlib-python2[gtk2,${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[gtk2,${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	dev-python/basemap[${PYTHON_SINGLE_USEDEP}]
 	sci-electronics/voacapl
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
similarity index 80%
rename from sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
rename to sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
index a5c36e5b53b4..4f8e8ef1e524 100644
--- a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| (
-		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-	dev-python/basemap[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	dev-python/basemap[${PYTHON_SINGLE_USEDEP}]
 	sci-electronics/voacapl
 "
 DEPEND="${RDEPEND}