dev-python/uranium: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
index fdbfe670aa9ad5733bc423a6e8ea9644a17ed4c3..e2e7e3c9f1d2d6f8f1e6d439f9b5f592e3f54661 100644 (file)
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -21,18 +21,24 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-       dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-       sci-libs/Shapely[${PYTHON_USEDEP}]
+       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+               sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtquickcontrols:5
        dev-qt/qtquickcontrols2:5"
 
 DEPEND="${RDEPEND}
        sys-devel/gettext
        doc? ( app-doc/doxygen )
-       test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+       test? (
+               $(python_gen_cond_dep '
+                       dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+               ')
+       )"
 
 DOCS=( README.md )
 

diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
index 8b3f307a109cc93df04f357c8f4954cf4068bc0b..3154436aac0b031bf780848a6f7e0a64524e85e0 100644 (file)
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -24,14 +24,20 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
        sys-devel/gettext
        doc? ( app-doc/doxygen )
-       test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+       test? (
+               $(python_gen_cond_dep '
+                       dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+               ')
+       )"
 
 RDEPEND="${PYTHON_DEPS}
-       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-       dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-       sci-libs/Shapely[${PYTHON_USEDEP}]
+       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+               sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtquickcontrols:5
        dev-qt/qtquickcontrols2:5"
 

diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild
similarity index 76%
rename from dev-python/uranium/uranium-4.3.0.ebuild
rename to dev-python/uranium/uranium-4.3.0-r1.ebuild
index 4ca593a01581a144ddf55ea27ba12ffc99c436ad..b5516dcefb707813deab544cbedc8d56ff62d24e 100644 (file)
--- a/dev-python/uranium/uranium-4.3.0.ebuild
+++ b/dev-python/uranium/uranium-4.3.0-r1.ebuild
@@ -25,16 +25,20 @@ BDEPEND="${PYTHON_DEPS}
        sys-devel/gettext
        doc? ( app-doc/doxygen )
        test? (
-               dev-python/pytest[${PYTHON_USEDEP}]
-               dev-python/mypy[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+                       dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+               ')
        )"
 
 RDEPEND="${PYTHON_DEPS}
-       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-       dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-       sci-libs/Shapely[${PYTHON_USEDEP}]
+       ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+               sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtquickcontrols:5
        dev-qt/qtquickcontrols2:5"