1 |
commit: c64207652232481f43135183d502f8d76bd5771b |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 14:43:59 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 14:44:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6420765 |
7 |
|
8 |
gnome-extra/cinnamon: fixup REQUIRED_USE |
9 |
|
10 |
Generate python_targets flags using python_gen_useflags. We don't need |
11 |
PYTHON_REQUIRED_USE since we generate a more strict set of flags anyway. |
12 |
|
13 |
Package-Manager: portage-2.3.2 |
14 |
|
15 |
gnome-extra/cinnamon/cinnamon-2.8.8.ebuild | 6 +++--- |
16 |
gnome-extra/cinnamon/cinnamon-3.0.6.ebuild | 6 +++--- |
17 |
gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 6 +++--- |
18 |
gnome-extra/cinnamon/cinnamon-3.0.7.ebuild | 6 +++--- |
19 |
4 files changed, 12 insertions(+), 12 deletions(-) |
20 |
|
21 |
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild |
22 |
index 4a341c8..6926d9f 100644 |
23 |
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild |
24 |
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild |
25 |
@@ -24,9 +24,9 @@ SLOT="0" |
26 |
IUSE="+nls +networkmanager" #+bluetooth |
27 |
|
28 |
# We need *both* python 2.7 and 3.x |
29 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
30 |
- python_targets_python2_7 |
31 |
- || ( python_targets_python3_4 python_targets_python3_5 ) |
32 |
+REQUIRED_USE=" |
33 |
+ $(python_gen_useflags 'python2*') |
34 |
+ || ( $(python_gen_useflags 'python3*') ) |
35 |
" |
36 |
|
37 |
KEYWORDS="amd64 x86" |
38 |
|
39 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild |
40 |
index c7b8dbf..436d772 100644 |
41 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild |
42 |
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild |
43 |
@@ -24,9 +24,9 @@ SLOT="0" |
44 |
IUSE="+nls +networkmanager" #+bluetooth |
45 |
|
46 |
# We need *both* python 2.7 and 3.x |
47 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
48 |
- python_targets_python2_7 |
49 |
- || ( python_targets_python3_4 python_targets_python3_5 ) |
50 |
+REQUIRED_USE=" |
51 |
+ $(python_gen_useflags 'python2*') |
52 |
+ || ( $(python_gen_useflags 'python3*') ) |
53 |
" |
54 |
|
55 |
KEYWORDS="~amd64 ~x86" |
56 |
|
57 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild |
58 |
index db72f00..374b93a 100644 |
59 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild |
60 |
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild |
61 |
@@ -24,9 +24,9 @@ SLOT="0" |
62 |
IUSE="+nls +networkmanager" #+bluetooth |
63 |
|
64 |
# We need *both* python 2.7 and 3.x |
65 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
66 |
- python_targets_python2_7 |
67 |
- || ( python_targets_python3_4 python_targets_python3_5 ) |
68 |
+REQUIRED_USE=" |
69 |
+ $(python_gen_useflags 'python2*') |
70 |
+ || ( $(python_gen_useflags 'python3*') ) |
71 |
" |
72 |
|
73 |
KEYWORDS="~amd64 ~x86" |
74 |
|
75 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild |
76 |
index dc5672e..0d4b662 100644 |
77 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild |
78 |
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild |
79 |
@@ -24,9 +24,9 @@ SLOT="0" |
80 |
IUSE="+nls +networkmanager" #+bluetooth |
81 |
|
82 |
# We need *both* python 2.7 and 3.x |
83 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
84 |
- python_targets_python2_7 |
85 |
- || ( python_targets_python3_4 python_targets_python3_5 ) |
86 |
+REQUIRED_USE=" |
87 |
+ $(python_gen_useflags 'python2*') |
88 |
+ || ( $(python_gen_useflags 'python3*') ) |
89 |
" |
90 |
|
91 |
KEYWORDS="amd64 x86" |