1 |
commit: 29d4814a066c0b99fbcd7c6f44d0645570d6ccaa |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 17:06:34 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 27 17:19:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d4814a |
7 |
|
8 |
dev-lang/moarvm: Fix dependency on libtommath-1.0 re bugs #608548 and #576284 |
9 |
|
10 |
Upstream has used a bundled copy of libtommath at version 1.0 since |
11 |
version 2016.02, but we use system copies, and so, which end users |
12 |
who are running full ~arch would have gotten a working version by |
13 |
fortunate accident. |
14 |
|
15 |
An -r1 bump is required here, as dependency propagation must replicate, |
16 |
even for people who already have compile working, as users must be |
17 |
discouraged fron downgrading libtommath if they try to do partial |
18 |
reversion to 'arch' |
19 |
|
20 |
Thanks to the patient reporters and commenters on the related bugs. |
21 |
|
22 |
Bug: https://bugs.gentoo.org/576284 |
23 |
Bug: https://bugs.gentoo.org/608548 |
24 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
25 |
|
26 |
...rvm-2017.02.ebuild => moarvm-2016.10-r1.ebuild} | 2 +- |
27 |
dev-lang/moarvm/moarvm-2016.10.ebuild | 61 ---------------------- |
28 |
...rvm-2017.03.ebuild => moarvm-2016.11-r1.ebuild} | 2 +- |
29 |
dev-lang/moarvm/moarvm-2016.11.ebuild | 61 ---------------------- |
30 |
...rvm-2017.04.ebuild => moarvm-2016.12-r1.ebuild} | 2 +- |
31 |
dev-lang/moarvm/moarvm-2016.12.ebuild | 61 ---------------------- |
32 |
...rvm-2017.01.ebuild => moarvm-2017.01-r1.ebuild} | 2 +- |
33 |
...rvm-2017.02.ebuild => moarvm-2017.02-r1.ebuild} | 2 +- |
34 |
...rvm-2017.02.ebuild => moarvm-2017.03-r1.ebuild} | 2 +- |
35 |
...rvm-2017.02.ebuild => moarvm-2017.04-r1.ebuild} | 2 +- |
36 |
...rvm-2017.02.ebuild => moarvm-2017.05-r1.ebuild} | 2 +- |
37 |
dev-lang/moarvm/moarvm-2017.05.ebuild | 61 ---------------------- |
38 |
...rvm-2017.02.ebuild => moarvm-2017.06-r1.ebuild} | 2 +- |
39 |
dev-lang/moarvm/moarvm-2017.06.ebuild | 61 ---------------------- |
40 |
dev-lang/moarvm/moarvm-9999.ebuild | 4 +- |
41 |
15 files changed, 11 insertions(+), 316 deletions(-) |
42 |
|
43 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2016.10-r1.ebuild |
44 |
similarity index 98% |
45 |
copy from dev-lang/moarvm/moarvm-2017.02.ebuild |
46 |
copy to dev-lang/moarvm/moarvm-2016.10-r1.ebuild |
47 |
index 44513e80382..f119a7ae28b 100644 |
48 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
49 |
+++ b/dev-lang/moarvm/moarvm-2016.10-r1.ebuild |
50 |
@@ -24,7 +24,7 @@ SLOT="0" |
51 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
52 |
|
53 |
RDEPEND="dev-libs/libatomic_ops |
54 |
- dev-libs/libtommath |
55 |
+ >=dev-libs/libtommath-1.0 |
56 |
dev-libs/libuv |
57 |
jit? ( dev-lang/lua:0[deprecated] |
58 |
dev-lua/LuaBitOp ) |
59 |
|
60 |
diff --git a/dev-lang/moarvm/moarvm-2016.10.ebuild b/dev-lang/moarvm/moarvm-2016.10.ebuild |
61 |
deleted file mode 100644 |
62 |
index 67393ca666f..00000000000 |
63 |
--- a/dev-lang/moarvm/moarvm-2016.10.ebuild |
64 |
+++ /dev/null |
65 |
@@ -1,61 +0,0 @@ |
66 |
-# Copyright 1999-2016 Gentoo Foundation |
67 |
-# Distributed under the terms of the GNU General Public License v2 |
68 |
- |
69 |
-EAPI=6 |
70 |
- |
71 |
-inherit flag-o-matic |
72 |
- |
73 |
-MY_PN="MoarVM" |
74 |
-if [[ ${PV} == "9999" ]]; then |
75 |
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" |
76 |
- inherit git-r3 |
77 |
- KEYWORDS="" |
78 |
- S="${WORKDIR}/${P}" |
79 |
-else |
80 |
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" |
81 |
- KEYWORDS="~amd64 ~x86" |
82 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
83 |
-fi |
84 |
- |
85 |
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" |
86 |
-HOMEPAGE="http://moarvm.org" |
87 |
-LICENSE="Artistic-2" |
88 |
-SLOT="0" |
89 |
-IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
90 |
- |
91 |
-RDEPEND="dev-libs/libatomic_ops |
92 |
- dev-libs/libtommath |
93 |
- dev-libs/libuv |
94 |
- jit? ( dev-lang/lua:0[deprecated] |
95 |
- dev-lua/LuaBitOp ) |
96 |
- virtual/libffi" |
97 |
-DEPEND="${RDEPEND} |
98 |
- clang? ( >=sys-devel/clang-3.1 ) |
99 |
- dev-lang/perl" |
100 |
- |
101 |
-DOCS=( CREDITS README.markdown ) |
102 |
- |
103 |
-# Tests are conducted via nqp |
104 |
-RESTRICT=test |
105 |
- |
106 |
-src_configure() { |
107 |
- use doc && DOCS+=( docs/* ) |
108 |
- local myconfigargs=( |
109 |
- "--prefix=/usr" |
110 |
- "--has-libtommath" |
111 |
- "--has-libuv" |
112 |
- "--has-libatomic_ops" |
113 |
- "--has-libffi" |
114 |
- "--libdir=$(get_libdir)" |
115 |
- "--compiler=$(usex clang clang gcc)" |
116 |
- "$(usex asan --asan)" |
117 |
- "$(usex debug --debug --no-debug)" |
118 |
- "$(usex jit --lua=/usr/bin/lua --no-jit)" |
119 |
- "$(usex optimize --optimize= --no-optimize)" |
120 |
- "$(usex static-libs --static)" |
121 |
- "$(usex ubsan --ubsan)" |
122 |
- ) |
123 |
- use optimize && filter-flags '-O*' |
124 |
- |
125 |
- perl Configure.pl "${myconfigargs[@]}" || die |
126 |
-} |
127 |
|
128 |
diff --git a/dev-lang/moarvm/moarvm-2017.03.ebuild b/dev-lang/moarvm/moarvm-2016.11-r1.ebuild |
129 |
similarity index 98% |
130 |
rename from dev-lang/moarvm/moarvm-2017.03.ebuild |
131 |
rename to dev-lang/moarvm/moarvm-2016.11-r1.ebuild |
132 |
index 44513e80382..f119a7ae28b 100644 |
133 |
--- a/dev-lang/moarvm/moarvm-2017.03.ebuild |
134 |
+++ b/dev-lang/moarvm/moarvm-2016.11-r1.ebuild |
135 |
@@ -24,7 +24,7 @@ SLOT="0" |
136 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
137 |
|
138 |
RDEPEND="dev-libs/libatomic_ops |
139 |
- dev-libs/libtommath |
140 |
+ >=dev-libs/libtommath-1.0 |
141 |
dev-libs/libuv |
142 |
jit? ( dev-lang/lua:0[deprecated] |
143 |
dev-lua/LuaBitOp ) |
144 |
|
145 |
diff --git a/dev-lang/moarvm/moarvm-2016.11.ebuild b/dev-lang/moarvm/moarvm-2016.11.ebuild |
146 |
deleted file mode 100644 |
147 |
index 67393ca666f..00000000000 |
148 |
--- a/dev-lang/moarvm/moarvm-2016.11.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,61 +0,0 @@ |
151 |
-# Copyright 1999-2016 Gentoo Foundation |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI=6 |
155 |
- |
156 |
-inherit flag-o-matic |
157 |
- |
158 |
-MY_PN="MoarVM" |
159 |
-if [[ ${PV} == "9999" ]]; then |
160 |
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" |
161 |
- inherit git-r3 |
162 |
- KEYWORDS="" |
163 |
- S="${WORKDIR}/${P}" |
164 |
-else |
165 |
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" |
166 |
- KEYWORDS="~amd64 ~x86" |
167 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
168 |
-fi |
169 |
- |
170 |
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" |
171 |
-HOMEPAGE="http://moarvm.org" |
172 |
-LICENSE="Artistic-2" |
173 |
-SLOT="0" |
174 |
-IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
175 |
- |
176 |
-RDEPEND="dev-libs/libatomic_ops |
177 |
- dev-libs/libtommath |
178 |
- dev-libs/libuv |
179 |
- jit? ( dev-lang/lua:0[deprecated] |
180 |
- dev-lua/LuaBitOp ) |
181 |
- virtual/libffi" |
182 |
-DEPEND="${RDEPEND} |
183 |
- clang? ( >=sys-devel/clang-3.1 ) |
184 |
- dev-lang/perl" |
185 |
- |
186 |
-DOCS=( CREDITS README.markdown ) |
187 |
- |
188 |
-# Tests are conducted via nqp |
189 |
-RESTRICT=test |
190 |
- |
191 |
-src_configure() { |
192 |
- use doc && DOCS+=( docs/* ) |
193 |
- local myconfigargs=( |
194 |
- "--prefix=/usr" |
195 |
- "--has-libtommath" |
196 |
- "--has-libuv" |
197 |
- "--has-libatomic_ops" |
198 |
- "--has-libffi" |
199 |
- "--libdir=$(get_libdir)" |
200 |
- "--compiler=$(usex clang clang gcc)" |
201 |
- "$(usex asan --asan)" |
202 |
- "$(usex debug --debug --no-debug)" |
203 |
- "$(usex jit --lua=/usr/bin/lua --no-jit)" |
204 |
- "$(usex optimize --optimize= --no-optimize)" |
205 |
- "$(usex static-libs --static)" |
206 |
- "$(usex ubsan --ubsan)" |
207 |
- ) |
208 |
- use optimize && filter-flags '-O*' |
209 |
- |
210 |
- perl Configure.pl "${myconfigargs[@]}" || die |
211 |
-} |
212 |
|
213 |
diff --git a/dev-lang/moarvm/moarvm-2017.04.ebuild b/dev-lang/moarvm/moarvm-2016.12-r1.ebuild |
214 |
similarity index 98% |
215 |
rename from dev-lang/moarvm/moarvm-2017.04.ebuild |
216 |
rename to dev-lang/moarvm/moarvm-2016.12-r1.ebuild |
217 |
index 44513e80382..f119a7ae28b 100644 |
218 |
--- a/dev-lang/moarvm/moarvm-2017.04.ebuild |
219 |
+++ b/dev-lang/moarvm/moarvm-2016.12-r1.ebuild |
220 |
@@ -24,7 +24,7 @@ SLOT="0" |
221 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
222 |
|
223 |
RDEPEND="dev-libs/libatomic_ops |
224 |
- dev-libs/libtommath |
225 |
+ >=dev-libs/libtommath-1.0 |
226 |
dev-libs/libuv |
227 |
jit? ( dev-lang/lua:0[deprecated] |
228 |
dev-lua/LuaBitOp ) |
229 |
|
230 |
diff --git a/dev-lang/moarvm/moarvm-2016.12.ebuild b/dev-lang/moarvm/moarvm-2016.12.ebuild |
231 |
deleted file mode 100644 |
232 |
index 67393ca666f..00000000000 |
233 |
--- a/dev-lang/moarvm/moarvm-2016.12.ebuild |
234 |
+++ /dev/null |
235 |
@@ -1,61 +0,0 @@ |
236 |
-# Copyright 1999-2016 Gentoo Foundation |
237 |
-# Distributed under the terms of the GNU General Public License v2 |
238 |
- |
239 |
-EAPI=6 |
240 |
- |
241 |
-inherit flag-o-matic |
242 |
- |
243 |
-MY_PN="MoarVM" |
244 |
-if [[ ${PV} == "9999" ]]; then |
245 |
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" |
246 |
- inherit git-r3 |
247 |
- KEYWORDS="" |
248 |
- S="${WORKDIR}/${P}" |
249 |
-else |
250 |
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" |
251 |
- KEYWORDS="~amd64 ~x86" |
252 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
253 |
-fi |
254 |
- |
255 |
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" |
256 |
-HOMEPAGE="http://moarvm.org" |
257 |
-LICENSE="Artistic-2" |
258 |
-SLOT="0" |
259 |
-IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
260 |
- |
261 |
-RDEPEND="dev-libs/libatomic_ops |
262 |
- dev-libs/libtommath |
263 |
- dev-libs/libuv |
264 |
- jit? ( dev-lang/lua:0[deprecated] |
265 |
- dev-lua/LuaBitOp ) |
266 |
- virtual/libffi" |
267 |
-DEPEND="${RDEPEND} |
268 |
- clang? ( >=sys-devel/clang-3.1 ) |
269 |
- dev-lang/perl" |
270 |
- |
271 |
-DOCS=( CREDITS README.markdown ) |
272 |
- |
273 |
-# Tests are conducted via nqp |
274 |
-RESTRICT=test |
275 |
- |
276 |
-src_configure() { |
277 |
- use doc && DOCS+=( docs/* ) |
278 |
- local myconfigargs=( |
279 |
- "--prefix=/usr" |
280 |
- "--has-libtommath" |
281 |
- "--has-libuv" |
282 |
- "--has-libatomic_ops" |
283 |
- "--has-libffi" |
284 |
- "--libdir=$(get_libdir)" |
285 |
- "--compiler=$(usex clang clang gcc)" |
286 |
- "$(usex asan --asan)" |
287 |
- "$(usex debug --debug --no-debug)" |
288 |
- "$(usex jit --lua=/usr/bin/lua --no-jit)" |
289 |
- "$(usex optimize --optimize= --no-optimize)" |
290 |
- "$(usex static-libs --static)" |
291 |
- "$(usex ubsan --ubsan)" |
292 |
- ) |
293 |
- use optimize && filter-flags '-O*' |
294 |
- |
295 |
- perl Configure.pl "${myconfigargs[@]}" || die |
296 |
-} |
297 |
|
298 |
diff --git a/dev-lang/moarvm/moarvm-2017.01.ebuild b/dev-lang/moarvm/moarvm-2017.01-r1.ebuild |
299 |
similarity index 98% |
300 |
rename from dev-lang/moarvm/moarvm-2017.01.ebuild |
301 |
rename to dev-lang/moarvm/moarvm-2017.01-r1.ebuild |
302 |
index 44513e80382..f119a7ae28b 100644 |
303 |
--- a/dev-lang/moarvm/moarvm-2017.01.ebuild |
304 |
+++ b/dev-lang/moarvm/moarvm-2017.01-r1.ebuild |
305 |
@@ -24,7 +24,7 @@ SLOT="0" |
306 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
307 |
|
308 |
RDEPEND="dev-libs/libatomic_ops |
309 |
- dev-libs/libtommath |
310 |
+ >=dev-libs/libtommath-1.0 |
311 |
dev-libs/libuv |
312 |
jit? ( dev-lang/lua:0[deprecated] |
313 |
dev-lua/LuaBitOp ) |
314 |
|
315 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2017.02-r1.ebuild |
316 |
similarity index 98% |
317 |
copy from dev-lang/moarvm/moarvm-2017.02.ebuild |
318 |
copy to dev-lang/moarvm/moarvm-2017.02-r1.ebuild |
319 |
index 44513e80382..f119a7ae28b 100644 |
320 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
321 |
+++ b/dev-lang/moarvm/moarvm-2017.02-r1.ebuild |
322 |
@@ -24,7 +24,7 @@ SLOT="0" |
323 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
324 |
|
325 |
RDEPEND="dev-libs/libatomic_ops |
326 |
- dev-libs/libtommath |
327 |
+ >=dev-libs/libtommath-1.0 |
328 |
dev-libs/libuv |
329 |
jit? ( dev-lang/lua:0[deprecated] |
330 |
dev-lua/LuaBitOp ) |
331 |
|
332 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2017.03-r1.ebuild |
333 |
similarity index 98% |
334 |
copy from dev-lang/moarvm/moarvm-2017.02.ebuild |
335 |
copy to dev-lang/moarvm/moarvm-2017.03-r1.ebuild |
336 |
index 44513e80382..f119a7ae28b 100644 |
337 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
338 |
+++ b/dev-lang/moarvm/moarvm-2017.03-r1.ebuild |
339 |
@@ -24,7 +24,7 @@ SLOT="0" |
340 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
341 |
|
342 |
RDEPEND="dev-libs/libatomic_ops |
343 |
- dev-libs/libtommath |
344 |
+ >=dev-libs/libtommath-1.0 |
345 |
dev-libs/libuv |
346 |
jit? ( dev-lang/lua:0[deprecated] |
347 |
dev-lua/LuaBitOp ) |
348 |
|
349 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2017.04-r1.ebuild |
350 |
similarity index 98% |
351 |
copy from dev-lang/moarvm/moarvm-2017.02.ebuild |
352 |
copy to dev-lang/moarvm/moarvm-2017.04-r1.ebuild |
353 |
index 44513e80382..f119a7ae28b 100644 |
354 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
355 |
+++ b/dev-lang/moarvm/moarvm-2017.04-r1.ebuild |
356 |
@@ -24,7 +24,7 @@ SLOT="0" |
357 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
358 |
|
359 |
RDEPEND="dev-libs/libatomic_ops |
360 |
- dev-libs/libtommath |
361 |
+ >=dev-libs/libtommath-1.0 |
362 |
dev-libs/libuv |
363 |
jit? ( dev-lang/lua:0[deprecated] |
364 |
dev-lua/LuaBitOp ) |
365 |
|
366 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2017.05-r1.ebuild |
367 |
similarity index 98% |
368 |
copy from dev-lang/moarvm/moarvm-2017.02.ebuild |
369 |
copy to dev-lang/moarvm/moarvm-2017.05-r1.ebuild |
370 |
index 44513e80382..f119a7ae28b 100644 |
371 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
372 |
+++ b/dev-lang/moarvm/moarvm-2017.05-r1.ebuild |
373 |
@@ -24,7 +24,7 @@ SLOT="0" |
374 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
375 |
|
376 |
RDEPEND="dev-libs/libatomic_ops |
377 |
- dev-libs/libtommath |
378 |
+ >=dev-libs/libtommath-1.0 |
379 |
dev-libs/libuv |
380 |
jit? ( dev-lang/lua:0[deprecated] |
381 |
dev-lua/LuaBitOp ) |
382 |
|
383 |
diff --git a/dev-lang/moarvm/moarvm-2017.05.ebuild b/dev-lang/moarvm/moarvm-2017.05.ebuild |
384 |
deleted file mode 100644 |
385 |
index 44513e80382..00000000000 |
386 |
--- a/dev-lang/moarvm/moarvm-2017.05.ebuild |
387 |
+++ /dev/null |
388 |
@@ -1,61 +0,0 @@ |
389 |
-# Copyright 1999-2017 Gentoo Foundation |
390 |
-# Distributed under the terms of the GNU General Public License v2 |
391 |
- |
392 |
-EAPI=6 |
393 |
- |
394 |
-inherit flag-o-matic |
395 |
- |
396 |
-MY_PN="MoarVM" |
397 |
-if [[ ${PV} == "9999" ]]; then |
398 |
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" |
399 |
- inherit git-r3 |
400 |
- KEYWORDS="" |
401 |
- S="${WORKDIR}/${P}" |
402 |
-else |
403 |
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" |
404 |
- KEYWORDS="~amd64 ~x86" |
405 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
406 |
-fi |
407 |
- |
408 |
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" |
409 |
-HOMEPAGE="http://moarvm.org" |
410 |
-LICENSE="Artistic-2" |
411 |
-SLOT="0" |
412 |
-IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
413 |
- |
414 |
-RDEPEND="dev-libs/libatomic_ops |
415 |
- dev-libs/libtommath |
416 |
- dev-libs/libuv |
417 |
- jit? ( dev-lang/lua:0[deprecated] |
418 |
- dev-lua/LuaBitOp ) |
419 |
- virtual/libffi" |
420 |
-DEPEND="${RDEPEND} |
421 |
- clang? ( >=sys-devel/clang-3.1 ) |
422 |
- dev-lang/perl" |
423 |
- |
424 |
-DOCS=( CREDITS README.markdown ) |
425 |
- |
426 |
-# Tests are conducted via nqp |
427 |
-RESTRICT=test |
428 |
- |
429 |
-src_configure() { |
430 |
- use doc && DOCS+=( docs/* ) |
431 |
- local myconfigargs=( |
432 |
- "--prefix=/usr" |
433 |
- "--has-libtommath" |
434 |
- "--has-libuv" |
435 |
- "--has-libatomic_ops" |
436 |
- "--has-libffi" |
437 |
- "--libdir=$(get_libdir)" |
438 |
- "--compiler=$(usex clang clang gcc)" |
439 |
- "$(usex asan --asan)" |
440 |
- "$(usex debug --debug --no-debug)" |
441 |
- "$(usex jit --lua=/usr/bin/lua --no-jit)" |
442 |
- "$(usex optimize --optimize= --no-optimize)" |
443 |
- "$(usex static-libs --static)" |
444 |
- "$(usex ubsan --ubsan)" |
445 |
- ) |
446 |
- use optimize && filter-flags '-O*' |
447 |
- |
448 |
- perl Configure.pl "${myconfigargs[@]}" || die |
449 |
-} |
450 |
|
451 |
diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2017.06-r1.ebuild |
452 |
similarity index 98% |
453 |
rename from dev-lang/moarvm/moarvm-2017.02.ebuild |
454 |
rename to dev-lang/moarvm/moarvm-2017.06-r1.ebuild |
455 |
index 44513e80382..f119a7ae28b 100644 |
456 |
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild |
457 |
+++ b/dev-lang/moarvm/moarvm-2017.06-r1.ebuild |
458 |
@@ -24,7 +24,7 @@ SLOT="0" |
459 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
460 |
|
461 |
RDEPEND="dev-libs/libatomic_ops |
462 |
- dev-libs/libtommath |
463 |
+ >=dev-libs/libtommath-1.0 |
464 |
dev-libs/libuv |
465 |
jit? ( dev-lang/lua:0[deprecated] |
466 |
dev-lua/LuaBitOp ) |
467 |
|
468 |
diff --git a/dev-lang/moarvm/moarvm-2017.06.ebuild b/dev-lang/moarvm/moarvm-2017.06.ebuild |
469 |
deleted file mode 100644 |
470 |
index 44513e80382..00000000000 |
471 |
--- a/dev-lang/moarvm/moarvm-2017.06.ebuild |
472 |
+++ /dev/null |
473 |
@@ -1,61 +0,0 @@ |
474 |
-# Copyright 1999-2017 Gentoo Foundation |
475 |
-# Distributed under the terms of the GNU General Public License v2 |
476 |
- |
477 |
-EAPI=6 |
478 |
- |
479 |
-inherit flag-o-matic |
480 |
- |
481 |
-MY_PN="MoarVM" |
482 |
-if [[ ${PV} == "9999" ]]; then |
483 |
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" |
484 |
- inherit git-r3 |
485 |
- KEYWORDS="" |
486 |
- S="${WORKDIR}/${P}" |
487 |
-else |
488 |
- SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" |
489 |
- KEYWORDS="~amd64 ~x86" |
490 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
491 |
-fi |
492 |
- |
493 |
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" |
494 |
-HOMEPAGE="http://moarvm.org" |
495 |
-LICENSE="Artistic-2" |
496 |
-SLOT="0" |
497 |
-IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
498 |
- |
499 |
-RDEPEND="dev-libs/libatomic_ops |
500 |
- dev-libs/libtommath |
501 |
- dev-libs/libuv |
502 |
- jit? ( dev-lang/lua:0[deprecated] |
503 |
- dev-lua/LuaBitOp ) |
504 |
- virtual/libffi" |
505 |
-DEPEND="${RDEPEND} |
506 |
- clang? ( >=sys-devel/clang-3.1 ) |
507 |
- dev-lang/perl" |
508 |
- |
509 |
-DOCS=( CREDITS README.markdown ) |
510 |
- |
511 |
-# Tests are conducted via nqp |
512 |
-RESTRICT=test |
513 |
- |
514 |
-src_configure() { |
515 |
- use doc && DOCS+=( docs/* ) |
516 |
- local myconfigargs=( |
517 |
- "--prefix=/usr" |
518 |
- "--has-libtommath" |
519 |
- "--has-libuv" |
520 |
- "--has-libatomic_ops" |
521 |
- "--has-libffi" |
522 |
- "--libdir=$(get_libdir)" |
523 |
- "--compiler=$(usex clang clang gcc)" |
524 |
- "$(usex asan --asan)" |
525 |
- "$(usex debug --debug --no-debug)" |
526 |
- "$(usex jit --lua=/usr/bin/lua --no-jit)" |
527 |
- "$(usex optimize --optimize= --no-optimize)" |
528 |
- "$(usex static-libs --static)" |
529 |
- "$(usex ubsan --ubsan)" |
530 |
- ) |
531 |
- use optimize && filter-flags '-O*' |
532 |
- |
533 |
- perl Configure.pl "${myconfigargs[@]}" || die |
534 |
-} |
535 |
|
536 |
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild |
537 |
index 67393ca666f..f119a7ae28b 100644 |
538 |
--- a/dev-lang/moarvm/moarvm-9999.ebuild |
539 |
+++ b/dev-lang/moarvm/moarvm-9999.ebuild |
540 |
@@ -1,4 +1,4 @@ |
541 |
-# Copyright 1999-2016 Gentoo Foundation |
542 |
+# Copyright 1999-2017 Gentoo Foundation |
543 |
# Distributed under the terms of the GNU General Public License v2 |
544 |
|
545 |
EAPI=6 |
546 |
@@ -24,7 +24,7 @@ SLOT="0" |
547 |
IUSE="asan clang debug doc +jit static-libs optimize ubsan" |
548 |
|
549 |
RDEPEND="dev-libs/libatomic_ops |
550 |
- dev-libs/libtommath |
551 |
+ >=dev-libs/libtommath-1.0 |
552 |
dev-libs/libuv |
553 |
jit? ( dev-lang/lua:0[deprecated] |
554 |
dev-lua/LuaBitOp ) |