From d82ad449acf5c8eac33c3d8d8637841c684e963e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 21:30:25 +0100 Subject: [PATCH] x11-misc/wbarconf: 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 --- ...rconf-0.7.2.2-r2.ebuild => wbarconf-0.7.2.2-r4.ebuild} | 8 +++++--- ...rconf-0.7.2.2-r3.ebuild => wbarconf-0.7.2.2-r5.ebuild} | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) rename x11-misc/wbarconf/{wbarconf-0.7.2.2-r2.ebuild => wbarconf-0.7.2.2-r4.ebuild} (80%) rename x11-misc/wbarconf/{wbarconf-0.7.2.2-r3.ebuild => wbarconf-0.7.2.2-r5.ebuild} (86%) diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild similarity index 80% rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild index d5ff90ab324e..3caca84352cf 100644 --- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild +++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,8 +21,10 @@ DEPEND="sys-devel/gettext" RDEPEND=" ${PYTHON_DEPS} >=x11-misc/wbar-1.3.3 - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/pygtk:2[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] + dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] + ')" S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}"/${P}-install.patch ) diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild similarity index 86% rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild index 2de548435dba..91921185ba32 100644 --- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild +++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild @@ -20,8 +20,10 @@ DEPEND=" RDEPEND=" ${PYTHON_DEPS} >=x11-misc/wbar-1.3.3 - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/pygtk:2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] + dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] + ') " PATCHES=( "${FILESDIR}"/${P}-install.patch -- 2.26.2