x11-terms/guake: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2-r1.ebuild
similarity index 84%
rename from x11-terms/guake/guake-3.3.2.ebuild
rename to x11-terms/guake/guake-3.3.2-r1.ebuild
index 1e1f6615a6064277dbd3eb38688c2730c80b8cd4..1426b793e688fd27c205f4b08772dd4cd4913a19 100644 (file)
--- a/x11-terms/guake/guake-3.3.2.ebuild
+++ b/x11-terms/guake/guake-3.3.2-r1.ebuild
@@ -18,17 +18,18 @@ IUSE="utempter"
 
 RDEPEND="
        dev-libs/keybinder:3
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/pbr[${PYTHON_USEDEP}]
-       dev-python/pycairo[${PYTHON_USEDEP}]
-       dev-python/pygobject:3[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
        x11-libs/libnotify
        x11-libs/vte:2.91
        utempter? ( sys-libs/libutempter )
 "
 DEPEND="
        ${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        gnome-base/gsettings-desktop-schemas
        sys-devel/gettext
        sys-devel/make

diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
index f4c8848b35df89df5be5d74c895b512d303750ac..204a40fe8f3bf2c39c8ef16823c4d07a84ae57ab 100644 (file)
--- a/x11-terms/guake/guake-3.4.0-r1.ebuild
+++ b/x11-terms/guake/guake-3.4.0-r1.ebuild
@@ -19,17 +19,18 @@ IUSE="utempter"
 RDEPEND="
        dev-libs/glib
        dev-libs/keybinder:3[introspection]
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/pbr[${PYTHON_USEDEP}]
-       dev-python/pycairo[${PYTHON_USEDEP}]
-       dev-python/pygobject:3[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
        x11-libs/libnotify[introspection]
        x11-libs/vte:2.91[introspection]
        utempter? ( sys-libs/libutempter )
 "
 DEPEND="
        ${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        gnome-base/gsettings-desktop-schemas
        sys-devel/gettext
        sys-devel/make

diff --git a/x11-terms/guake/guake-3.6.1-r1.ebuild b/x11-terms/guake/guake-3.6.1-r1.ebuild
index 240b059d9fc389e2b03fe2b3fdc1bd2791d09f7d..9b8a60187706dc4cbf08333b8c00d94b76edeb00 100644 (file)
--- a/x11-terms/guake/guake-3.6.1-r1.ebuild
+++ b/x11-terms/guake/guake-3.6.1-r1.ebuild
@@ -19,10 +19,12 @@ IUSE="utempter"
 RDEPEND="
        dev-libs/glib
        dev-libs/keybinder:3[introspection]
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/pbr[${PYTHON_USEDEP}]
-       dev-python/pycairo[${PYTHON_USEDEP}]
-       dev-python/pygobject:3[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
        x11-libs/libnotify[introspection]
        x11-libs/libwnck:3[introspection]
        x11-libs/vte:2.91[introspection]
@@ -30,7 +32,6 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        gnome-base/gsettings-desktop-schemas
        sys-devel/gettext
        sys-devel/make

diff --git a/x11-terms/guake/guake-3.6.3.ebuild b/x11-terms/guake/guake-3.6.3-r1.ebuild
similarity index 87%
rename from x11-terms/guake/guake-3.6.3.ebuild
rename to x11-terms/guake/guake-3.6.3-r1.ebuild
index fc373929f91ec2c9cca6b7acc9b51eea633e22ef..ccfa02f3d129b343081b97c9528e1c6f30342694 100644 (file)
--- a/x11-terms/guake/guake-3.6.3.ebuild
+++ b/x11-terms/guake/guake-3.6.3-r1.ebuild
@@ -19,10 +19,12 @@ IUSE="utempter"
 RDEPEND="
        dev-libs/glib
        dev-libs/keybinder:3[introspection]
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/pbr[${PYTHON_USEDEP}]
-       dev-python/pycairo[${PYTHON_USEDEP}]
-       dev-python/pygobject:3[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
        x11-libs/libnotify[introspection]
        x11-libs/libwnck:3[introspection]
        x11-libs/vte:2.91[introspection]
@@ -30,7 +32,6 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        gnome-base/gsettings-desktop-schemas
        sys-devel/gettext
        sys-devel/make

diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index e76390e51bc7662b03f13c08abed61629fda0a8a..d062cfbe9bb9a70f281148b7fc6a41174eaa7bcd 100644 (file)
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -19,10 +19,12 @@ IUSE="utempter"
 RDEPEND="
        dev-libs/glib
        dev-libs/keybinder:3[introspection]
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/pbr[${PYTHON_USEDEP}]
-       dev-python/pycairo[${PYTHON_USEDEP}]
-       dev-python/pygobject:3[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
        x11-libs/libnotify[introspection]
        x11-libs/libwnck:3[introspection]
        x11-libs/vte:2.91[introspection]
@@ -30,7 +32,6 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        gnome-base/gsettings-desktop-schemas
        sys-devel/gettext
        sys-devel/make