From e814042be921a649c907d2d4ec83bc1e088c407c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 8 Feb 2020 07:35:47 +0100
Subject: [PATCH] dev-vcs/git-cola: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 ...la-2.11.ebuild => git-cola-2.11-r1.ebuild} | 20 ++++++++-----
 dev-vcs/git-cola/git-cola-3.2.ebuild          | 29 +++++++++++--------
 ...cola-3.5.ebuild => git-cola-3.5-r1.ebuild} | 24 ++++++++-------
 3 files changed, 43 insertions(+), 30 deletions(-)
 rename dev-vcs/git-cola/{git-cola-2.11.ebuild => git-cola-2.11-r1.ebuild} (84%)
 rename dev-vcs/git-cola/{git-cola-3.5.ebuild => git-cola-3.5-r1.ebuild} (82%)

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 d97f4818b85a..f0df3414753e 100644
--- 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 de021727cffa..1d8dcb00b087 100644
--- 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 9fb8610abf7d..9a1bb3679f78 100644
--- 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
-- 
2.26.2