1 |
commit: 37ec456ffe51429e00c9dccfedd8686543046568 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 14 05:45:20 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 14 05:47:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ec456f |
7 |
|
8 |
net-libs/nodejs: Inherit python-any-r1 instead of python-single-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Bug: https://bugs.gentoo.org/692074 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
net-libs/nodejs/nodejs-0.12.18.ebuild | 5 ++--- |
15 |
net-libs/nodejs/nodejs-10.15.3.ebuild | 3 +-- |
16 |
net-libs/nodejs/nodejs-10.16.0.ebuild | 3 +-- |
17 |
net-libs/nodejs/nodejs-10.16.2.ebuild | 3 +-- |
18 |
net-libs/nodejs/nodejs-11.14.0.ebuild | 3 +-- |
19 |
net-libs/nodejs/nodejs-11.15.0.ebuild | 3 +-- |
20 |
net-libs/nodejs/nodejs-12.7.0.ebuild | 3 +-- |
21 |
net-libs/nodejs/nodejs-12.8.0.ebuild | 3 +-- |
22 |
net-libs/nodejs/nodejs-4.9.1.ebuild | 5 ++--- |
23 |
net-libs/nodejs/nodejs-6.14.4.ebuild | 5 ++--- |
24 |
net-libs/nodejs/nodejs-6.17.1.ebuild | 3 +-- |
25 |
net-libs/nodejs/nodejs-8.12.0.ebuild | 5 ++--- |
26 |
net-libs/nodejs/nodejs-8.16.0.ebuild | 3 +-- |
27 |
net-libs/nodejs/nodejs-99999999.ebuild | 3 +-- |
28 |
14 files changed, 18 insertions(+), 32 deletions(-) |
29 |
|
30 |
diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild |
31 |
index f45d645a9c5..40890e98679 100644 |
32 |
--- a/net-libs/nodejs/nodejs-0.12.18.ebuild |
33 |
+++ b/net-libs/nodejs/nodejs-0.12.18.ebuild |
34 |
@@ -1,4 +1,4 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=6 |
40 |
@@ -9,7 +9,7 @@ RESTRICT="test" |
41 |
PYTHON_COMPAT=( python2_7 ) |
42 |
PYTHON_REQ_USE="threads" |
43 |
|
44 |
-inherit pax-utils python-single-r1 toolchain-funcs |
45 |
+inherit pax-utils python-any-r1 toolchain-funcs |
46 |
|
47 |
DESCRIPTION="Evented IO for V8 Javascript" |
48 |
HOMEPAGE="http://nodejs.org/" |
49 |
@@ -28,7 +28,6 @@ RDEPEND="icu? ( dev-libs/icu ) |
50 |
DEPEND="${RDEPEND}" |
51 |
|
52 |
S="${WORKDIR}/node-v${PV}" |
53 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
54 |
|
55 |
src_prepare() { |
56 |
tc-export CC CXX PKG_CONFIG |
57 |
|
58 |
diff --git a/net-libs/nodejs/nodejs-10.15.3.ebuild b/net-libs/nodejs/nodejs-10.15.3.ebuild |
59 |
index b11ce9d0f9f..402fcfc9804 100644 |
60 |
--- a/net-libs/nodejs/nodejs-10.15.3.ebuild |
61 |
+++ b/net-libs/nodejs/nodejs-10.15.3.ebuild |
62 |
@@ -6,7 +6,7 @@ EAPI=6 |
63 |
PYTHON_COMPAT=( python2_7 ) |
64 |
PYTHON_REQ_USE="threads" |
65 |
|
66 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
67 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
68 |
|
69 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
70 |
HOMEPAGE="https://nodejs.org/" |
71 |
@@ -17,7 +17,6 @@ SLOT="0" |
72 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
73 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
74 |
REQUIRED_USE=" |
75 |
- ${PYTHON_REQUIRED_USE} |
76 |
inspector? ( icu ssl ) |
77 |
npm? ( ssl ) |
78 |
" |
79 |
|
80 |
diff --git a/net-libs/nodejs/nodejs-10.16.0.ebuild b/net-libs/nodejs/nodejs-10.16.0.ebuild |
81 |
index c55a7a4b975..f04f7f06504 100644 |
82 |
--- a/net-libs/nodejs/nodejs-10.16.0.ebuild |
83 |
+++ b/net-libs/nodejs/nodejs-10.16.0.ebuild |
84 |
@@ -6,7 +6,7 @@ EAPI=6 |
85 |
PYTHON_COMPAT=( python2_7 ) |
86 |
PYTHON_REQ_USE="threads" |
87 |
|
88 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
89 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
90 |
|
91 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
92 |
HOMEPAGE="https://nodejs.org/" |
93 |
@@ -17,7 +17,6 @@ SLOT="0" |
94 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
95 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
96 |
REQUIRED_USE=" |
97 |
- ${PYTHON_REQUIRED_USE} |
98 |
inspector? ( icu ssl ) |
99 |
npm? ( ssl ) |
100 |
" |
101 |
|
102 |
diff --git a/net-libs/nodejs/nodejs-10.16.2.ebuild b/net-libs/nodejs/nodejs-10.16.2.ebuild |
103 |
index c55a7a4b975..f04f7f06504 100644 |
104 |
--- a/net-libs/nodejs/nodejs-10.16.2.ebuild |
105 |
+++ b/net-libs/nodejs/nodejs-10.16.2.ebuild |
106 |
@@ -6,7 +6,7 @@ EAPI=6 |
107 |
PYTHON_COMPAT=( python2_7 ) |
108 |
PYTHON_REQ_USE="threads" |
109 |
|
110 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
111 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
112 |
|
113 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
114 |
HOMEPAGE="https://nodejs.org/" |
115 |
@@ -17,7 +17,6 @@ SLOT="0" |
116 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
117 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
118 |
REQUIRED_USE=" |
119 |
- ${PYTHON_REQUIRED_USE} |
120 |
inspector? ( icu ssl ) |
121 |
npm? ( ssl ) |
122 |
" |
123 |
|
124 |
diff --git a/net-libs/nodejs/nodejs-11.14.0.ebuild b/net-libs/nodejs/nodejs-11.14.0.ebuild |
125 |
index 9ecdc16ab4e..b59441c56a2 100644 |
126 |
--- a/net-libs/nodejs/nodejs-11.14.0.ebuild |
127 |
+++ b/net-libs/nodejs/nodejs-11.14.0.ebuild |
128 |
@@ -6,7 +6,7 @@ EAPI=6 |
129 |
PYTHON_COMPAT=( python2_7 ) |
130 |
PYTHON_REQ_USE="threads" |
131 |
|
132 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
133 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
134 |
|
135 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
136 |
HOMEPAGE="https://nodejs.org/" |
137 |
@@ -17,7 +17,6 @@ SLOT="0" |
138 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
139 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
140 |
REQUIRED_USE=" |
141 |
- ${PYTHON_REQUIRED_USE} |
142 |
inspector? ( icu ssl ) |
143 |
npm? ( ssl ) |
144 |
" |
145 |
|
146 |
diff --git a/net-libs/nodejs/nodejs-11.15.0.ebuild b/net-libs/nodejs/nodejs-11.15.0.ebuild |
147 |
index a4d1604959a..2abeb82f572 100644 |
148 |
--- a/net-libs/nodejs/nodejs-11.15.0.ebuild |
149 |
+++ b/net-libs/nodejs/nodejs-11.15.0.ebuild |
150 |
@@ -4,7 +4,7 @@ |
151 |
EAPI=7 |
152 |
PYTHON_COMPAT=( python2_7 ) |
153 |
PYTHON_REQ_USE="threads" |
154 |
-inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs |
155 |
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs |
156 |
|
157 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
158 |
HOMEPAGE="https://nodejs.org/" |
159 |
@@ -15,7 +15,6 @@ SLOT="0" |
160 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
161 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
162 |
REQUIRED_USE=" |
163 |
- ${PYTHON_REQUIRED_USE} |
164 |
inspector? ( icu ssl ) |
165 |
npm? ( ssl ) |
166 |
" |
167 |
|
168 |
diff --git a/net-libs/nodejs/nodejs-12.7.0.ebuild b/net-libs/nodejs/nodejs-12.7.0.ebuild |
169 |
index aacd0ea8457..7b13a5877e4 100644 |
170 |
--- a/net-libs/nodejs/nodejs-12.7.0.ebuild |
171 |
+++ b/net-libs/nodejs/nodejs-12.7.0.ebuild |
172 |
@@ -4,7 +4,7 @@ |
173 |
EAPI=7 |
174 |
PYTHON_COMPAT=( python2_7 ) |
175 |
PYTHON_REQ_USE="threads" |
176 |
-inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs |
177 |
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs |
178 |
|
179 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
180 |
HOMEPAGE="https://nodejs.org/" |
181 |
@@ -15,7 +15,6 @@ SLOT="0" |
182 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
183 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
184 |
REQUIRED_USE=" |
185 |
- ${PYTHON_REQUIRED_USE} |
186 |
inspector? ( icu ssl ) |
187 |
npm? ( ssl ) |
188 |
" |
189 |
|
190 |
diff --git a/net-libs/nodejs/nodejs-12.8.0.ebuild b/net-libs/nodejs/nodejs-12.8.0.ebuild |
191 |
index aacd0ea8457..7b13a5877e4 100644 |
192 |
--- a/net-libs/nodejs/nodejs-12.8.0.ebuild |
193 |
+++ b/net-libs/nodejs/nodejs-12.8.0.ebuild |
194 |
@@ -4,7 +4,7 @@ |
195 |
EAPI=7 |
196 |
PYTHON_COMPAT=( python2_7 ) |
197 |
PYTHON_REQ_USE="threads" |
198 |
-inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs |
199 |
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs |
200 |
|
201 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
202 |
HOMEPAGE="https://nodejs.org/" |
203 |
@@ -15,7 +15,6 @@ SLOT="0" |
204 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
205 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
206 |
REQUIRED_USE=" |
207 |
- ${PYTHON_REQUIRED_USE} |
208 |
inspector? ( icu ssl ) |
209 |
npm? ( ssl ) |
210 |
" |
211 |
|
212 |
diff --git a/net-libs/nodejs/nodejs-4.9.1.ebuild b/net-libs/nodejs/nodejs-4.9.1.ebuild |
213 |
index d3f61ffab16..4c5b0406dda 100644 |
214 |
--- a/net-libs/nodejs/nodejs-4.9.1.ebuild |
215 |
+++ b/net-libs/nodejs/nodejs-4.9.1.ebuild |
216 |
@@ -1,4 +1,4 @@ |
217 |
-# Copyright 1999-2018 Gentoo Foundation |
218 |
+# Copyright 1999-2019 Gentoo Authors |
219 |
# Distributed under the terms of the GNU General Public License v2 |
220 |
|
221 |
EAPI=6 |
222 |
@@ -6,7 +6,7 @@ EAPI=6 |
223 |
PYTHON_COMPAT=( python2_7 ) |
224 |
PYTHON_REQ_USE="threads" |
225 |
|
226 |
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
227 |
+inherit flag-o-matic pax-utils python-any-r1 toolchain-funcs |
228 |
|
229 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
230 |
HOMEPAGE="https://nodejs.org/" |
231 |
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND} |
232 |
test? ( net-misc/curl )" |
233 |
|
234 |
S="${WORKDIR}/node-v${PV}" |
235 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
236 |
|
237 |
pkg_pretend() { |
238 |
(use x86 && ! use cpu_flags_x86_sse2) && \ |
239 |
|
240 |
diff --git a/net-libs/nodejs/nodejs-6.14.4.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild |
241 |
index 82d1e57e437..909ebd44dfe 100644 |
242 |
--- a/net-libs/nodejs/nodejs-6.14.4.ebuild |
243 |
+++ b/net-libs/nodejs/nodejs-6.14.4.ebuild |
244 |
@@ -1,4 +1,4 @@ |
245 |
-# Copyright 1999-2018 Gentoo Authors |
246 |
+# Copyright 1999-2019 Gentoo Authors |
247 |
# Distributed under the terms of the GNU General Public License v2 |
248 |
|
249 |
EAPI=6 |
250 |
@@ -6,7 +6,7 @@ EAPI=6 |
251 |
PYTHON_COMPAT=( python2_7 ) |
252 |
PYTHON_REQ_USE="threads" |
253 |
|
254 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
255 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
256 |
|
257 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
258 |
HOMEPAGE="https://nodejs.org/" |
259 |
@@ -17,7 +17,6 @@ SLOT="0" |
260 |
KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x64-macos" |
261 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" |
262 |
REQUIRED_USE=" |
263 |
- ${PYTHON_REQUIRED_USE} |
264 |
inspector? ( icu ssl ) |
265 |
" |
266 |
|
267 |
|
268 |
diff --git a/net-libs/nodejs/nodejs-6.17.1.ebuild b/net-libs/nodejs/nodejs-6.17.1.ebuild |
269 |
index 8db127221fd..814a80538d1 100644 |
270 |
--- a/net-libs/nodejs/nodejs-6.17.1.ebuild |
271 |
+++ b/net-libs/nodejs/nodejs-6.17.1.ebuild |
272 |
@@ -6,7 +6,7 @@ EAPI=6 |
273 |
PYTHON_COMPAT=( python2_7 ) |
274 |
PYTHON_REQ_USE="threads" |
275 |
|
276 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
277 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
278 |
|
279 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
280 |
HOMEPAGE="https://nodejs.org/" |
281 |
@@ -17,7 +17,6 @@ SLOT="0" |
282 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
283 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" |
284 |
REQUIRED_USE=" |
285 |
- ${PYTHON_REQUIRED_USE} |
286 |
inspector? ( icu ssl ) |
287 |
" |
288 |
|
289 |
|
290 |
diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild |
291 |
index ff4d5a46bf5..afa60f606e0 100644 |
292 |
--- a/net-libs/nodejs/nodejs-8.12.0.ebuild |
293 |
+++ b/net-libs/nodejs/nodejs-8.12.0.ebuild |
294 |
@@ -1,4 +1,4 @@ |
295 |
-# Copyright 1999-2018 Gentoo Authors |
296 |
+# Copyright 1999-2019 Gentoo Authors |
297 |
# Distributed under the terms of the GNU General Public License v2 |
298 |
|
299 |
EAPI=6 |
300 |
@@ -7,7 +7,7 @@ RESTRICT="test" |
301 |
PYTHON_COMPAT=( python2_7 ) |
302 |
PYTHON_REQ_USE="threads" |
303 |
|
304 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
305 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
306 |
|
307 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
308 |
HOMEPAGE="https://nodejs.org/" |
309 |
@@ -18,7 +18,6 @@ SLOT="0" |
310 |
KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos" |
311 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
312 |
REQUIRED_USE=" |
313 |
- ${PYTHON_REQUIRED_USE} |
314 |
inspector? ( icu ssl ) |
315 |
npm? ( ssl ) |
316 |
" |
317 |
|
318 |
diff --git a/net-libs/nodejs/nodejs-8.16.0.ebuild b/net-libs/nodejs/nodejs-8.16.0.ebuild |
319 |
index 059aa2d524e..8ea43457082 100644 |
320 |
--- a/net-libs/nodejs/nodejs-8.16.0.ebuild |
321 |
+++ b/net-libs/nodejs/nodejs-8.16.0.ebuild |
322 |
@@ -7,7 +7,7 @@ RESTRICT="test" |
323 |
PYTHON_COMPAT=( python2_7 ) |
324 |
PYTHON_REQ_USE="threads" |
325 |
|
326 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
327 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs |
328 |
|
329 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
330 |
HOMEPAGE="https://nodejs.org/" |
331 |
@@ -18,7 +18,6 @@ SLOT="0" |
332 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
333 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
334 |
REQUIRED_USE=" |
335 |
- ${PYTHON_REQUIRED_USE} |
336 |
inspector? ( icu ssl ) |
337 |
npm? ( ssl ) |
338 |
" |
339 |
|
340 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild |
341 |
index 4a4a27553da..b660199af75 100644 |
342 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
343 |
+++ b/net-libs/nodejs/nodejs-99999999.ebuild |
344 |
@@ -4,7 +4,7 @@ |
345 |
EAPI=7 |
346 |
PYTHON_COMPAT=( python2_7 ) |
347 |
PYTHON_REQ_USE="threads" |
348 |
-inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
349 |
+inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs |
350 |
|
351 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
352 |
HOMEPAGE="https://nodejs.org/" |
353 |
@@ -15,7 +15,6 @@ SLOT="0" |
354 |
KEYWORDS="" |
355 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
356 |
REQUIRED_USE=" |
357 |
- ${PYTHON_REQUIRED_USE} |
358 |
inspector? ( icu ssl ) |
359 |
npm? ( ssl ) |
360 |
" |