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

Signed-off-by: Michał Górny <[email protected]>
johu · Feb 9, 2020 · e814042 · e814042
1 parent ce09018
commit e814042
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 30 deletions.
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild → dev-vcs/git-cola/git-cola-2.11-r1.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild → 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
@@ -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 → dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5.ebuild → 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