[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/

[Michał Górny]

commit:     1c98fe8bc128858fa999409a779a1a72812bd524
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 15:06:53 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:26:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c98fe8b

media-gfx/zbar: Switch to PYTHON_MULTI_USEDEP API

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

 media-gfx/zbar/{zbar-0.20.1-r1.ebuild => zbar-0.20.1-r2.ebuild} | 8 ++++++--
 media-gfx/zbar/{zbar-0.23.ebuild => zbar-0.23-r1.ebuild}        | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
similarity index 96%
rename from media-gfx/zbar/zbar-0.20.1-r1.ebuild
rename to media-gfx/zbar/zbar-0.20.1-r2.ebuild
index 9a6382e3b61..5aba21e790d 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,11 @@ COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	python? (
 		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+		gtk? (
+			$(python_gen_cond_dep '
+				>=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+			')
+		)
 	)
 	qt5? (
 		dev-qt/qtcore:5

diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
similarity index 98%
rename from media-gfx/zbar/zbar-0.23.ebuild
rename to media-gfx/zbar/zbar-0.23-r1.ebuild
index 495dc423d47..87656810dce 100644
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -66,7 +66,9 @@ DEPEND="${COMMON_DEPEND}
 	)
 	test? (
 		${PYTHON_DEPS}
-		dev-python/pillow[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 BDEPEND="