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 854920aa56a8c88ecf8c3c8251757f64a48d7b29..729017cea4fce55bd847c92d9dc1b875fd8da4aa 100644 (file)
--- 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 a5c36e5b53b4d19043dc840cd873da427dab9712..4f8e8ef1e5240fee83b0c4813fb2ca29a0581558 100644 (file)
--- 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}