dev-vcs/git-cola: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
similarity index 84%
rename from dev-vcs/git-cola/git-cola-2.11.ebuild
rename to dev-vcs/git-cola/git-cola-2.11-r1.ebuild
index d97f4818b85a4379056dbd6aff125a52e47f90b7..f0df3414753ef19461ec83bd84cf55ef23908b20 100644 (file)
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
@@ -20,17 +20,21 @@ RESTRICT="!test? ( test )"
 
 # Since PyQt5 is preferred at runtime if installed, depend on that
 RDEPEND="
-       dev-python/pyinotify[${PYTHON_USEDEP}]
-       dev-python/send2trash[${PYTHON_USEDEP}]
-       dev-python/QtPy[gui,${PYTHON_USEDEP}]
-       dev-python/PyQt5[gui,network,widgets,${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+               dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+               dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+               dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+       ')
        dev-vcs/git"
 DEPEND="${RDEPEND}
        sys-devel/gettext
-       doc? (
-               dev-python/sphinx[${PYTHON_USEDEP}]
-               )
-       test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
+       $(python_gen_cond_dep "
+               doc? (
+                       dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+                       )
+               test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} )
+       ")
 "
 
 PATCHES=(

diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index de021727cffaa2d1e2e407b102e04d10fb3cb038..1d8dcb00b08730ff1f2e180ae95d3eb40834eff2 100644 (file)
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -18,21 +18,26 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       dev-python/pygments[${PYTHON_USEDEP}]
-       dev-python/send2trash[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '
+               dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+               dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-vcs/git"
 DEPEND="${RDEPEND}
        sys-devel/gettext
-       doc? (
-               dev-python/sphinx[${PYTHON_USEDEP}]
-               )
-       test? (
-               ${VIRTUALX_DEPEND}
-               dev-python/nose[${PYTHON_USEDEP}]
-               dev-python/mock[${PYTHON_USEDEP}]
-               )"
+       $(python_gen_cond_dep "
+               doc? (
+                       dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+                       )
+               test? (
+                       ${VIRTUALX_DEPEND}
+                       dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+                       dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+                       )
+       ")"
 
 python_prepare_all() {
        # make sure that tests also use the system provided QtPy

diff --git a/dev-vcs/git-cola/git-cola-3.5.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
similarity index 82%
rename from dev-vcs/git-cola/git-cola-3.5.ebuild
rename to dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 9fb8610abf7d1c70b3ea8c5dbe8afe8eeb108147..9a1bb3679f78b8cca2b874a60bbc3f0440165b95 100644 (file)
--- a/dev-vcs/git-cola/git-cola-3.5.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -19,18 +19,22 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-       dev-python/numpy[${PYTHON_USEDEP}]
-       dev-python/pygments[${PYTHON_USEDEP}]
-       dev-python/QtPy[gui,${PYTHON_USEDEP}]
-       dev-python/send2trash[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+               dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+               dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-vcs/git"
 BDEPEND="sys-devel/gettext
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               ${VIRTUALX_DEPEND}
-               dev-python/mock[${PYTHON_USEDEP}]
-               dev-python/nose[${PYTHON_USEDEP}]
-       )"
+       $(python_gen_cond_dep "
+               doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+               test? (
+                       ${VIRTUALX_DEPEND}
+                       dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+                       dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")"
 
 python_prepare_all() {
        # make sure that tests also use the system provided QtPy