commit:     0de04f9324dd2b15888a38325b573ae2d3f92dd1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 07:01:16 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:46:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de04f93

x11-terms/guake: Switch to PYTHON_MULTI_USEDEP API

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

 x11-terms/guake/{guake-3.3.2.ebuild => guake-3.3.2-r1.ebuild} | 11 ++++++-----
 x11-terms/guake/guake-3.4.0-r1.ebuild                         | 11 ++++++-----
 x11-terms/guake/guake-3.6.1-r1.ebuild                         | 11 ++++++-----
 x11-terms/guake/{guake-3.6.3.ebuild => guake-3.6.3-r1.ebuild} | 11 ++++++-----
 x11-terms/guake/guake-9999.ebuild                             | 11 ++++++-----
 5 files changed, 30 insertions(+), 25 deletions(-)

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 1e1f6615a60..1426b793e68 100644
--- 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 f4c8848b35d..204a40fe8f3 100644
--- 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 240b059d9fc..9b8a6018770 100644
--- 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 fc373929f91..ccfa02f3d12 100644
--- 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 e76390e51bc..d062cfbe9bb 100644
--- 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

Reply via email to