1 |
commit: 12ea994e9abbfc7d8e2d65e138afc8c556309a9a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 13:14:49 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:21:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ea994e |
7 |
|
8 |
dev-util/lldb: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-util/lldb/lldb-10.0.0.9999.ebuild | 12 +++++++++--- |
13 |
dev-util/lldb/lldb-10.0.0_rc1.ebuild | 12 +++++++++--- |
14 |
dev-util/lldb/lldb-11.0.0.9999.ebuild | 12 +++++++++--- |
15 |
.../lldb/{lldb-7.1.0.ebuild => lldb-7.1.0-r1.ebuild} | 16 ++++++++++++---- |
16 |
.../lldb/{lldb-8.0.1.ebuild => lldb-8.0.1-r1.ebuild} | 16 ++++++++++++---- |
17 |
.../lldb/{lldb-9.0.1.ebuild => lldb-9.0.1-r1.ebuild} | 12 +++++++++--- |
18 |
6 files changed, 60 insertions(+), 20 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
21 |
index 332d07439b7..33100fdcdcc 100644 |
22 |
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild |
23 |
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild |
24 |
@@ -24,8 +24,12 @@ RDEPEND=" |
25 |
libedit? ( dev-libs/libedit:0= ) |
26 |
lzma? ( app-arch/xz-utils:= ) |
27 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
28 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
29 |
- ${PYTHON_DEPS} ) |
30 |
+ python? ( |
31 |
+ $(python_gen_cond_dep ' |
32 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
33 |
+ ') |
34 |
+ ${PYTHON_DEPS} |
35 |
+ ) |
36 |
~sys-devel/clang-${PV}[xml] |
37 |
~sys-devel/llvm-${PV} |
38 |
!<sys-devel/llvm-4.0" |
39 |
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}" |
40 |
BDEPEND=" |
41 |
python? ( >=dev-lang/swig-3.0.11 ) |
42 |
test? ( |
43 |
- ~dev-python/lit-${PV}[${PYTHON_USEDEP}] |
44 |
+ $(python_gen_cond_dep " |
45 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
46 |
+ ") |
47 |
sys-devel/lld ) |
48 |
${PYTHON_DEPS}" |
49 |
|
50 |
|
51 |
diff --git a/dev-util/lldb/lldb-10.0.0_rc1.ebuild b/dev-util/lldb/lldb-10.0.0_rc1.ebuild |
52 |
index 332d07439b7..33100fdcdcc 100644 |
53 |
--- a/dev-util/lldb/lldb-10.0.0_rc1.ebuild |
54 |
+++ b/dev-util/lldb/lldb-10.0.0_rc1.ebuild |
55 |
@@ -24,8 +24,12 @@ RDEPEND=" |
56 |
libedit? ( dev-libs/libedit:0= ) |
57 |
lzma? ( app-arch/xz-utils:= ) |
58 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
59 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
60 |
- ${PYTHON_DEPS} ) |
61 |
+ python? ( |
62 |
+ $(python_gen_cond_dep ' |
63 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
64 |
+ ') |
65 |
+ ${PYTHON_DEPS} |
66 |
+ ) |
67 |
~sys-devel/clang-${PV}[xml] |
68 |
~sys-devel/llvm-${PV} |
69 |
!<sys-devel/llvm-4.0" |
70 |
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}" |
71 |
BDEPEND=" |
72 |
python? ( >=dev-lang/swig-3.0.11 ) |
73 |
test? ( |
74 |
- ~dev-python/lit-${PV}[${PYTHON_USEDEP}] |
75 |
+ $(python_gen_cond_dep " |
76 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
77 |
+ ") |
78 |
sys-devel/lld ) |
79 |
${PYTHON_DEPS}" |
80 |
|
81 |
|
82 |
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild |
83 |
index 332d07439b7..33100fdcdcc 100644 |
84 |
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild |
85 |
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild |
86 |
@@ -24,8 +24,12 @@ RDEPEND=" |
87 |
libedit? ( dev-libs/libedit:0= ) |
88 |
lzma? ( app-arch/xz-utils:= ) |
89 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
90 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
91 |
- ${PYTHON_DEPS} ) |
92 |
+ python? ( |
93 |
+ $(python_gen_cond_dep ' |
94 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
95 |
+ ') |
96 |
+ ${PYTHON_DEPS} |
97 |
+ ) |
98 |
~sys-devel/clang-${PV}[xml] |
99 |
~sys-devel/llvm-${PV} |
100 |
!<sys-devel/llvm-4.0" |
101 |
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}" |
102 |
BDEPEND=" |
103 |
python? ( >=dev-lang/swig-3.0.11 ) |
104 |
test? ( |
105 |
- ~dev-python/lit-${PV}[${PYTHON_USEDEP}] |
106 |
+ $(python_gen_cond_dep " |
107 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
108 |
+ ") |
109 |
sys-devel/lld ) |
110 |
${PYTHON_DEPS}" |
111 |
|
112 |
|
113 |
diff --git a/dev-util/lldb/lldb-7.1.0.ebuild b/dev-util/lldb/lldb-7.1.0-r1.ebuild |
114 |
similarity index 92% |
115 |
rename from dev-util/lldb/lldb-7.1.0.ebuild |
116 |
rename to dev-util/lldb/lldb-7.1.0-r1.ebuild |
117 |
index a2c3d26a653..a1d46a86309 100644 |
118 |
--- a/dev-util/lldb/lldb-7.1.0.ebuild |
119 |
+++ b/dev-util/lldb/lldb-7.1.0-r1.ebuild |
120 |
@@ -1,4 +1,4 @@ |
121 |
-# Copyright 1999-2019 Gentoo Authors |
122 |
+# Copyright 1999-2020 Gentoo Authors |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
|
125 |
EAPI=6 |
126 |
@@ -30,14 +30,22 @@ RESTRICT="test" |
127 |
RDEPEND=" |
128 |
libedit? ( dev-libs/libedit:0= ) |
129 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
130 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
131 |
- ${PYTHON_DEPS} ) |
132 |
+ python? ( |
133 |
+ $(python_gen_cond_dep ' |
134 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
135 |
+ ') |
136 |
+ ${PYTHON_DEPS} |
137 |
+ ) |
138 |
~sys-devel/clang-${PV}[xml] |
139 |
~sys-devel/llvm-${PV} |
140 |
!<sys-devel/llvm-4.0" |
141 |
DEPEND="${RDEPEND} |
142 |
python? ( >=dev-lang/swig-3.0.11 ) |
143 |
- test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] ) |
144 |
+ test? ( |
145 |
+ $(python_gen_cond_dep " |
146 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
147 |
+ ") |
148 |
+ ) |
149 |
${PYTHON_DEPS}" |
150 |
|
151 |
REQUIRED_USE=${PYTHON_REQUIRED_USE} |
152 |
|
153 |
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1-r1.ebuild |
154 |
similarity index 92% |
155 |
rename from dev-util/lldb/lldb-8.0.1.ebuild |
156 |
rename to dev-util/lldb/lldb-8.0.1-r1.ebuild |
157 |
index 2adb8cdb9ad..fa7d98390e6 100644 |
158 |
--- a/dev-util/lldb/lldb-8.0.1.ebuild |
159 |
+++ b/dev-util/lldb/lldb-8.0.1-r1.ebuild |
160 |
@@ -1,4 +1,4 @@ |
161 |
-# Copyright 1999-2019 Gentoo Authors |
162 |
+# Copyright 1999-2020 Gentoo Authors |
163 |
# Distributed under the terms of the GNU General Public License v2 |
164 |
|
165 |
EAPI=6 |
166 |
@@ -28,14 +28,22 @@ RESTRICT="!test? ( test )" |
167 |
RDEPEND=" |
168 |
libedit? ( dev-libs/libedit:0= ) |
169 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
170 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
171 |
- ${PYTHON_DEPS} ) |
172 |
+ python? ( |
173 |
+ $(python_gen_cond_dep ' |
174 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
175 |
+ ') |
176 |
+ ${PYTHON_DEPS} |
177 |
+ ) |
178 |
~sys-devel/clang-${PV}[xml] |
179 |
~sys-devel/llvm-${PV} |
180 |
!<sys-devel/llvm-4.0" |
181 |
DEPEND="${RDEPEND} |
182 |
python? ( >=dev-lang/swig-3.0.11 ) |
183 |
- test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] ) |
184 |
+ test? ( |
185 |
+ $(python_gen_cond_dep " |
186 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
187 |
+ ") |
188 |
+ ) |
189 |
${PYTHON_DEPS}" |
190 |
|
191 |
REQUIRED_USE=${PYTHON_REQUIRED_USE} |
192 |
|
193 |
diff --git a/dev-util/lldb/lldb-9.0.1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild |
194 |
similarity index 92% |
195 |
rename from dev-util/lldb/lldb-9.0.1.ebuild |
196 |
rename to dev-util/lldb/lldb-9.0.1-r1.ebuild |
197 |
index 20d744e17b9..2afd2452347 100644 |
198 |
--- a/dev-util/lldb/lldb-9.0.1.ebuild |
199 |
+++ b/dev-util/lldb/lldb-9.0.1-r1.ebuild |
200 |
@@ -23,8 +23,12 @@ RESTRICT="!test? ( test )" |
201 |
RDEPEND=" |
202 |
libedit? ( dev-libs/libedit:0= ) |
203 |
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) |
204 |
- python? ( dev-python/six[${PYTHON_USEDEP}] |
205 |
- ${PYTHON_DEPS} ) |
206 |
+ python? ( |
207 |
+ $(python_gen_cond_dep ' |
208 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
209 |
+ ') |
210 |
+ ${PYTHON_DEPS} |
211 |
+ ) |
212 |
~sys-devel/clang-${PV}[xml] |
213 |
~sys-devel/llvm-${PV} |
214 |
!<sys-devel/llvm-4.0" |
215 |
@@ -32,7 +36,9 @@ DEPEND="${RDEPEND}" |
216 |
BDEPEND=" |
217 |
python? ( >=dev-lang/swig-3.0.11 ) |
218 |
test? ( |
219 |
- ~dev-python/lit-${PV}[${PYTHON_USEDEP}] |
220 |
+ $(python_gen_cond_dep " |
221 |
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}] |
222 |
+ ") |
223 |
sys-devel/lld ) |
224 |
${PYTHON_DEPS}" |