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

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

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 109631bea787d85313077b954ae0384212b4b7eb..a9ae0d2b2e4af7c07d2bc687d6c0f61bce57befa 100644 (file)
--- 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 b4a515ce051465a7baad3dba3864d9aadeb93344..36c7cc681d2cfa860ec75db6e263d4475636fbed 100644 (file)
--- 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 fe990bf96f21f9c2fabd26fcb108a1404e8bbbde..50d09788256093601edf48a83d790f858e7bdbbf 100644 (file)
--- 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