1 |
commit: d82ad449acf5c8eac33c3d8d8637841c684e963e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 20:30:25 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:37:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82ad449 |
7 |
|
8 |
x11-misc/wbarconf: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../{wbarconf-0.7.2.2-r2.ebuild => wbarconf-0.7.2.2-r4.ebuild} | 8 +++++--- |
13 |
.../{wbarconf-0.7.2.2-r3.ebuild => wbarconf-0.7.2.2-r5.ebuild} | 6 ++++-- |
14 |
2 files changed, 9 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild |
17 |
similarity index 80% |
18 |
rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild |
19 |
rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild |
20 |
index d5ff90ab324..3caca84352c 100644 |
21 |
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild |
22 |
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2017 Gentoo Foundation |
25 |
+# Copyright 1999-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=6 |
29 |
@@ -21,8 +21,10 @@ DEPEND="sys-devel/gettext" |
30 |
RDEPEND=" |
31 |
${PYTHON_DEPS} |
32 |
>=x11-misc/wbar-1.3.3 |
33 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
34 |
- dev-python/pygtk:2[${PYTHON_USEDEP}]" |
35 |
+ $(python_gen_cond_dep ' |
36 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
37 |
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] |
38 |
+ ')" |
39 |
|
40 |
S="${WORKDIR}/${PN}" |
41 |
PATCHES=( "${FILESDIR}"/${P}-install.patch ) |
42 |
|
43 |
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild |
44 |
similarity index 86% |
45 |
rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild |
46 |
rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild |
47 |
index 2de548435db..91921185ba3 100644 |
48 |
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild |
49 |
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild |
50 |
@@ -20,8 +20,10 @@ DEPEND=" |
51 |
RDEPEND=" |
52 |
${PYTHON_DEPS} |
53 |
>=x11-misc/wbar-1.3.3 |
54 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
55 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
56 |
+ $(python_gen_cond_dep ' |
57 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
58 |
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] |
59 |
+ ') |
60 |
" |
61 |
PATCHES=( |
62 |
"${FILESDIR}"/${P}-install.patch |