From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1144335-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A6D7138350 for <garchives@archives.gentoo.org>; Sun, 9 Feb 2020 16:29:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7351E087C; Sun, 9 Feb 2020 16:29:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A3CEE087C for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2020 16:29:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D55C34E8D6 for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2020 16:29:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FF9413F for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2020 16:29:34 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org> Message-ID: <1581265614.1c98fe8bc128858fa999409a779a1a72812bd524.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/zbar-0.20.1-r1.ebuild media-gfx/zbar/zbar-0.20.1-r2.ebuild media-gfx/zbar/zbar-0.23-r1.ebuild media-gfx/zbar/zbar-0.23.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1c98fe8bc128858fa999409a779a1a72812bd524 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:29:34 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fa33b1e2-17cf-4f1c-8934-b0b963e63641 X-Archives-Hash: eb5ecc6d59199bead2c99f78052c6efb 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="