From 097cfd66029af1cb8111feba9f27eadfe849ec19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 15:54:35 +0100 Subject: [PATCH] gnome-extra/cinnamon-screensaver: 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 --- .../cinnamon-screensaver-3.6.1-r1.ebuild | 10 ++++++---- .../cinnamon-screensaver-3.8.0.ebuild | 10 ++++++---- ...0.1.ebuild => cinnamon-screensaver-4.0.1-r1.ebuild} | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) rename gnome-extra/cinnamon-screensaver/{cinnamon-screensaver-4.0.1.ebuild => cinnamon-screensaver-4.0.1-r1.ebuild} (89%) diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild index 109631bea787..a9ae0d2b2e4a 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild @@ -47,10 +47,12 @@ COMMON_DEPEND=" # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack RDEPEND="${COMMON_DEPEND} !~gnome-extra/cinnamon-1.8.8.1 - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/xapp[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] + dev-python/xapp[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild index b4a515ce0514..36c7cc681d2c 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild @@ -47,10 +47,12 @@ COMMON_DEPEND=" # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack RDEPEND="${COMMON_DEPEND} !~gnome-extra/cinnamon-1.8.8.1 - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/xapp[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] + dev-python/xapp[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild similarity index 89% rename from gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild rename to gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild index fe990bf96f21..50d097882560 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild @@ -47,10 +47,12 @@ COMMON_DEPEND=" # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack RDEPEND="${COMMON_DEPEND} !~gnome-extra/cinnamon-1.8.8.1 - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/xapp[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] + dev-python/xapp[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 -- 2.26.2