From 21137f65e4af2ce31d19a83a88584f0b6d8a8258 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 15:52:38 +0100 Subject: [PATCH] gnome-base/gnome-shell: 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 --- gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild | 4 +++- ...ome-shell-3.32.2.ebuild => gnome-shell-3.32.2-r1.ebuild} | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) rename gnome-base/gnome-shell/{gnome-shell-3.32.2.ebuild => gnome-shell-3.32.2-r1.ebuild} (97%) diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild index 601a0789119c..6daa3d58709a 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild @@ -59,7 +59,9 @@ COMMON_DEPEND=" >=x11-libs/libXfixes-5.0 ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') media-libs/mesa[X(+)] " # Runtime-only deps are probably incomplete and approximate. diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild similarity index 97% rename from gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild index cc2d09d474c4..3b1c0f71c323 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild @@ -8,7 +8,7 @@ inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="GPL-2+ LGPL-2+" SLOT="0" @@ -56,7 +56,9 @@ DEPEND=" >=x11-libs/libXfixes-5.0 ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') media-libs/mesa[X(+)] " # Runtime-only deps are probably incomplete and approximate. -- 2.26.2