[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/

[Michał Górny]

commit:     097cfd66029af1cb8111feba9f27eadfe849ec19
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 14:54:35 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:22:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097cfd66

gnome-extra/cinnamon-screensaver: Switch to PYTHON_MULTI_USEDEP API

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

 .../cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild  | 10 ++++++----
 .../cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild     | 10 ++++++----
 ...saver-4.0.1.ebuild => cinnamon-screensaver-4.0.1-r1.ebuild} | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

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 109631bea78..a9ae0d2b2e4 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 b4a515ce051..36c7cc681d2 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 fe990bf96f2..50d09788256 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