From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 15:06:53 +0000 (+0100)
Subject: media-gfx/zbar: Switch to PYTHON_MULTI_USEDEP API
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1c98fe8bc128858fa999409a779a1a72812bd524;p=gentoo.git

media-gfx/zbar: Switch to PYTHON_MULTI_USEDEP API

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

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 9a6382e3b61f..5aba21e790d8 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 495dc423d47e..87656810dce6 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="