Gentoo Archives: gentoo-commits

From: "罗百科" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/
Date: Wed, 23 Jun 2021 15:17:34
Message-Id: 1624461448.7da115ea5e92b33a204b48af5bb393f929503afc.patrick@gentoo
1 commit: 7da115ea5e92b33a204b48af5bb393f929503afc
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 23 15:16:52 2021 +0000
4 Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 23 15:17:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da115ea
7
8 dev-lang/nqp: Remove old
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
12
13 dev-lang/nqp/Manifest | 3 -
14 dev-lang/nqp/nqp-2020.11.ebuild | 159 ----------------------------------------
15 dev-lang/nqp/nqp-2020.12.ebuild | 159 ----------------------------------------
16 dev-lang/nqp/nqp-2021.02.ebuild | 159 ----------------------------------------
17 4 files changed, 480 deletions(-)
18
19 diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
20 index 7f060c48ab4..55a9f3fe449 100644
21 --- a/dev-lang/nqp/Manifest
22 +++ b/dev-lang/nqp/Manifest
23 @@ -1,4 +1 @@
24 -DIST nqp-2020.11.tar.gz 3954688 BLAKE2B d273c78c8f2083908b2815dc10787fec31404eb13c1e64253e7e5ae896d27a3755cf5c8045d47c4f465178568731e0d74951db6e45d103cf3ee18470124e97e0 SHA512 51b5e7f9d290bca7ada24cf9c12c61608be92269fc848976cada49f7445694e0f26929b5f9e90a9153eb379f0d74a6bb8068cd5ebf383d4501f75535b70e7605
25 -DIST nqp-2020.12.tar.gz 3957981 BLAKE2B d45ad66ebb0788db6e7191b4b7af4093b73e63e5f66ab4ccab62163b0285adb7d4e18a7c906c34f99dd63e0920f4d6e16e11005eb5df1d726796e9f106f9c4f8 SHA512 4ce87dc868c91565ebe896db766403bb018b2f5ea919bd0fb5b173498ba124712ffa795ec4e219240e5aabb59c55285bee5e46d3ac3d5869fc445b0ab3ea8485
26 -DIST nqp-2021.02.tar.gz 3987077 BLAKE2B 3f67e33b948805a7c4dad1999e310d36da0cd8d4663b20ada5af6079c8ad2966c1f65e9f24c620f16480b7dea42a166f73fec61f3849e2cdd79b28ec017b0d7f SHA512 ff6cf66f4c1d9bccbd4cc5f52e49d380aaeef3fa060ced9e1da6c233e674fa90c08a5f1fa86e1a7beb5661d1271454934b520ba3e07e27cebaece343be84bdfe
27 DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe
28
29 diff --git a/dev-lang/nqp/nqp-2020.11.ebuild b/dev-lang/nqp/nqp-2020.11.ebuild
30 deleted file mode 100644
31 index 81e93919b90..00000000000
32 --- a/dev-lang/nqp/nqp-2020.11.ebuild
33 +++ /dev/null
34 @@ -1,159 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit java-pkg-opt-2 multibuild
41 -
42 -if [[ ${PV} == "9999" ]]; then
43 - EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
44 - inherit git-r3
45 -else
46 - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
47 - KEYWORDS="~amd64 ~x86"
48 -fi
49 -
50 -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
51 -HOMEPAGE="https://rakudo.org"
52 -
53 -LICENSE="Artistic-2"
54 -SLOT="0"
55 -IUSE="doc clang java +moar test"
56 -RESTRICT="!test? ( test )"
57 -REQUIRED_USE="|| ( java moar )"
58 -
59 -CDEPEND="java? (
60 - dev-java/asm:4
61 - dev-java/jline:0
62 - dev-java/jna:4
63 - )
64 - moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
65 -RDEPEND="${CDEPEND}
66 - java? ( >=virtual/jre-1.8 )"
67 -DEPEND="${CDEPEND}"
68 -BDEPEND="${CDEPEND}
69 - clang? ( sys-devel/clang )
70 - java? ( >=virtual/jdk-1.8 )
71 - dev-lang/perl"
72 -
73 -pkg_pretend() {
74 - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
75 - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
76 - ewarn "already being installed. So if it fails, try uninstalling both"
77 - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
78 - ewarn "(see Bug #584394)"
79 - fi
80 -}
81 -
82 -java_prepare() {
83 - # Don't clean stage0 jars.
84 - einfo "Cleaning upstream jars"
85 - java-pkg_clean 3rdparty/
86 -
87 - # Don't use jars we just deleted.
88 - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
89 - src/vm/jvm/runners/nqp-j || die
90 -}
91 -
92 -src_prepare() {
93 - MULTIBUILD_VARIANTS=()
94 - use moar && MULTIBUILD_VARIANTS+=( moar )
95 - use java && MULTIBUILD_VARIANTS+=( jvm )
96 -
97 - multibuild_copy_sources
98 -
99 - # This will pull in conditional java_prepare
100 - default
101 -}
102 -
103 -nqp_configure() {
104 - pushd "${BUILD_DIR}" > /dev/null || die
105 - local myconfargs=(
106 - "--backend=${MULTIBUILD_VARIANT}"
107 - "--prefix=${EPREFIX}/usr" )
108 -
109 - perl Configure.pl "${myconfargs[@]}" || die
110 - popd || die
111 -}
112 -
113 -nqp_compile() {
114 - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
115 - emake -j1 \
116 - -C "${BUILD_DIR}" \
117 - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
118 - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
119 - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
120 - emake -j1 \
121 - -C "${BUILD_DIR}"
122 - fi
123 -}
124 -
125 -nqp_test() {
126 - emake -j1 \
127 - -C "${BUILD_DIR}" \
128 - test
129 -}
130 -
131 -nqp_install() {
132 - # This is the actual reason we need multibuild.eclass.
133 - # We need to distinguish the install procedure for MoarVM and JVM backends.
134 - case "${MULTIBUILD_VARIANT}" in
135 - moar)
136 - emake \
137 - DESTDIR="${ED}" \
138 - -C "${BUILD_DIR}" \
139 - install
140 - ;;
141 - jvm)
142 - pushd "${BUILD_DIR}" > /dev/null || die
143 - # Set JAVA_PKG_JARDEST early.
144 - java-pkg_init_paths_
145 -
146 - # Upstream sets the classpath to this location. Perhaps it's
147 - # used to locate the additional libraries?
148 - java-pkg_addcp "${JAVA_PKG_JARDEST}"
149 -
150 - insinto "${JAVA_PKG_JARDEST}"
151 - local jar
152 -
153 - for jar in *.jar; do
154 - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
155 - # jars for NQP itself.
156 - java-pkg_dojar ${jar}
157 - else
158 - # jars used by NQP.
159 - doins ${jar}
160 - fi
161 - done
162 -
163 - # Upstream uses -Xbootclasspath/a, which is faster due to lack
164 - # of verification, but gjl isn't flexible enough yet. :(
165 - java-pkg_dolauncher ${PN}-j --main ${PN}
166 - dosym ${PN}-j /usr/bin/${PN}
167 - dobin tools/jvm/eval-client.pl
168 - popd > /dev/null || die
169 - ;;
170 - *)
171 - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
172 - ;;
173 - esac
174 -}
175 -
176 -src_configure() {
177 - multibuild_foreach_variant nqp_configure
178 -}
179 -
180 -src_compile() {
181 - multibuild_foreach_variant nqp_compile
182 -}
183 -
184 -src_test() {
185 - multibuild_foreach_variant nqp_test
186 -}
187 -
188 -src_install() {
189 - multibuild_foreach_variant nqp_install
190 -
191 - dodoc CREDITS README.pod
192 - use doc && dodoc -r docs/*
193 -}
194
195 diff --git a/dev-lang/nqp/nqp-2020.12.ebuild b/dev-lang/nqp/nqp-2020.12.ebuild
196 deleted file mode 100644
197 index 81e93919b90..00000000000
198 --- a/dev-lang/nqp/nqp-2020.12.ebuild
199 +++ /dev/null
200 @@ -1,159 +0,0 @@
201 -# Copyright 1999-2021 Gentoo Authors
202 -# Distributed under the terms of the GNU General Public License v2
203 -
204 -EAPI=7
205 -
206 -inherit java-pkg-opt-2 multibuild
207 -
208 -if [[ ${PV} == "9999" ]]; then
209 - EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
210 - inherit git-r3
211 -else
212 - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
213 - KEYWORDS="~amd64 ~x86"
214 -fi
215 -
216 -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
217 -HOMEPAGE="https://rakudo.org"
218 -
219 -LICENSE="Artistic-2"
220 -SLOT="0"
221 -IUSE="doc clang java +moar test"
222 -RESTRICT="!test? ( test )"
223 -REQUIRED_USE="|| ( java moar )"
224 -
225 -CDEPEND="java? (
226 - dev-java/asm:4
227 - dev-java/jline:0
228 - dev-java/jna:4
229 - )
230 - moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
231 -RDEPEND="${CDEPEND}
232 - java? ( >=virtual/jre-1.8 )"
233 -DEPEND="${CDEPEND}"
234 -BDEPEND="${CDEPEND}
235 - clang? ( sys-devel/clang )
236 - java? ( >=virtual/jdk-1.8 )
237 - dev-lang/perl"
238 -
239 -pkg_pretend() {
240 - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
241 - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
242 - ewarn "already being installed. So if it fails, try uninstalling both"
243 - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
244 - ewarn "(see Bug #584394)"
245 - fi
246 -}
247 -
248 -java_prepare() {
249 - # Don't clean stage0 jars.
250 - einfo "Cleaning upstream jars"
251 - java-pkg_clean 3rdparty/
252 -
253 - # Don't use jars we just deleted.
254 - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
255 - src/vm/jvm/runners/nqp-j || die
256 -}
257 -
258 -src_prepare() {
259 - MULTIBUILD_VARIANTS=()
260 - use moar && MULTIBUILD_VARIANTS+=( moar )
261 - use java && MULTIBUILD_VARIANTS+=( jvm )
262 -
263 - multibuild_copy_sources
264 -
265 - # This will pull in conditional java_prepare
266 - default
267 -}
268 -
269 -nqp_configure() {
270 - pushd "${BUILD_DIR}" > /dev/null || die
271 - local myconfargs=(
272 - "--backend=${MULTIBUILD_VARIANT}"
273 - "--prefix=${EPREFIX}/usr" )
274 -
275 - perl Configure.pl "${myconfargs[@]}" || die
276 - popd || die
277 -}
278 -
279 -nqp_compile() {
280 - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
281 - emake -j1 \
282 - -C "${BUILD_DIR}" \
283 - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
284 - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
285 - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
286 - emake -j1 \
287 - -C "${BUILD_DIR}"
288 - fi
289 -}
290 -
291 -nqp_test() {
292 - emake -j1 \
293 - -C "${BUILD_DIR}" \
294 - test
295 -}
296 -
297 -nqp_install() {
298 - # This is the actual reason we need multibuild.eclass.
299 - # We need to distinguish the install procedure for MoarVM and JVM backends.
300 - case "${MULTIBUILD_VARIANT}" in
301 - moar)
302 - emake \
303 - DESTDIR="${ED}" \
304 - -C "${BUILD_DIR}" \
305 - install
306 - ;;
307 - jvm)
308 - pushd "${BUILD_DIR}" > /dev/null || die
309 - # Set JAVA_PKG_JARDEST early.
310 - java-pkg_init_paths_
311 -
312 - # Upstream sets the classpath to this location. Perhaps it's
313 - # used to locate the additional libraries?
314 - java-pkg_addcp "${JAVA_PKG_JARDEST}"
315 -
316 - insinto "${JAVA_PKG_JARDEST}"
317 - local jar
318 -
319 - for jar in *.jar; do
320 - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
321 - # jars for NQP itself.
322 - java-pkg_dojar ${jar}
323 - else
324 - # jars used by NQP.
325 - doins ${jar}
326 - fi
327 - done
328 -
329 - # Upstream uses -Xbootclasspath/a, which is faster due to lack
330 - # of verification, but gjl isn't flexible enough yet. :(
331 - java-pkg_dolauncher ${PN}-j --main ${PN}
332 - dosym ${PN}-j /usr/bin/${PN}
333 - dobin tools/jvm/eval-client.pl
334 - popd > /dev/null || die
335 - ;;
336 - *)
337 - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
338 - ;;
339 - esac
340 -}
341 -
342 -src_configure() {
343 - multibuild_foreach_variant nqp_configure
344 -}
345 -
346 -src_compile() {
347 - multibuild_foreach_variant nqp_compile
348 -}
349 -
350 -src_test() {
351 - multibuild_foreach_variant nqp_test
352 -}
353 -
354 -src_install() {
355 - multibuild_foreach_variant nqp_install
356 -
357 - dodoc CREDITS README.pod
358 - use doc && dodoc -r docs/*
359 -}
360
361 diff --git a/dev-lang/nqp/nqp-2021.02.ebuild b/dev-lang/nqp/nqp-2021.02.ebuild
362 deleted file mode 100644
363 index 81e93919b90..00000000000
364 --- a/dev-lang/nqp/nqp-2021.02.ebuild
365 +++ /dev/null
366 @@ -1,159 +0,0 @@
367 -# Copyright 1999-2021 Gentoo Authors
368 -# Distributed under the terms of the GNU General Public License v2
369 -
370 -EAPI=7
371 -
372 -inherit java-pkg-opt-2 multibuild
373 -
374 -if [[ ${PV} == "9999" ]]; then
375 - EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
376 - inherit git-r3
377 -else
378 - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
379 - KEYWORDS="~amd64 ~x86"
380 -fi
381 -
382 -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
383 -HOMEPAGE="https://rakudo.org"
384 -
385 -LICENSE="Artistic-2"
386 -SLOT="0"
387 -IUSE="doc clang java +moar test"
388 -RESTRICT="!test? ( test )"
389 -REQUIRED_USE="|| ( java moar )"
390 -
391 -CDEPEND="java? (
392 - dev-java/asm:4
393 - dev-java/jline:0
394 - dev-java/jna:4
395 - )
396 - moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
397 -RDEPEND="${CDEPEND}
398 - java? ( >=virtual/jre-1.8 )"
399 -DEPEND="${CDEPEND}"
400 -BDEPEND="${CDEPEND}
401 - clang? ( sys-devel/clang )
402 - java? ( >=virtual/jdk-1.8 )
403 - dev-lang/perl"
404 -
405 -pkg_pretend() {
406 - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
407 - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
408 - ewarn "already being installed. So if it fails, try uninstalling both"
409 - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
410 - ewarn "(see Bug #584394)"
411 - fi
412 -}
413 -
414 -java_prepare() {
415 - # Don't clean stage0 jars.
416 - einfo "Cleaning upstream jars"
417 - java-pkg_clean 3rdparty/
418 -
419 - # Don't use jars we just deleted.
420 - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
421 - src/vm/jvm/runners/nqp-j || die
422 -}
423 -
424 -src_prepare() {
425 - MULTIBUILD_VARIANTS=()
426 - use moar && MULTIBUILD_VARIANTS+=( moar )
427 - use java && MULTIBUILD_VARIANTS+=( jvm )
428 -
429 - multibuild_copy_sources
430 -
431 - # This will pull in conditional java_prepare
432 - default
433 -}
434 -
435 -nqp_configure() {
436 - pushd "${BUILD_DIR}" > /dev/null || die
437 - local myconfargs=(
438 - "--backend=${MULTIBUILD_VARIANT}"
439 - "--prefix=${EPREFIX}/usr" )
440 -
441 - perl Configure.pl "${myconfargs[@]}" || die
442 - popd || die
443 -}
444 -
445 -nqp_compile() {
446 - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
447 - emake -j1 \
448 - -C "${BUILD_DIR}" \
449 - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
450 - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
451 - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
452 - emake -j1 \
453 - -C "${BUILD_DIR}"
454 - fi
455 -}
456 -
457 -nqp_test() {
458 - emake -j1 \
459 - -C "${BUILD_DIR}" \
460 - test
461 -}
462 -
463 -nqp_install() {
464 - # This is the actual reason we need multibuild.eclass.
465 - # We need to distinguish the install procedure for MoarVM and JVM backends.
466 - case "${MULTIBUILD_VARIANT}" in
467 - moar)
468 - emake \
469 - DESTDIR="${ED}" \
470 - -C "${BUILD_DIR}" \
471 - install
472 - ;;
473 - jvm)
474 - pushd "${BUILD_DIR}" > /dev/null || die
475 - # Set JAVA_PKG_JARDEST early.
476 - java-pkg_init_paths_
477 -
478 - # Upstream sets the classpath to this location. Perhaps it's
479 - # used to locate the additional libraries?
480 - java-pkg_addcp "${JAVA_PKG_JARDEST}"
481 -
482 - insinto "${JAVA_PKG_JARDEST}"
483 - local jar
484 -
485 - for jar in *.jar; do
486 - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
487 - # jars for NQP itself.
488 - java-pkg_dojar ${jar}
489 - else
490 - # jars used by NQP.
491 - doins ${jar}
492 - fi
493 - done
494 -
495 - # Upstream uses -Xbootclasspath/a, which is faster due to lack
496 - # of verification, but gjl isn't flexible enough yet. :(
497 - java-pkg_dolauncher ${PN}-j --main ${PN}
498 - dosym ${PN}-j /usr/bin/${PN}
499 - dobin tools/jvm/eval-client.pl
500 - popd > /dev/null || die
501 - ;;
502 - *)
503 - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
504 - ;;
505 - esac
506 -}
507 -
508 -src_configure() {
509 - multibuild_foreach_variant nqp_configure
510 -}
511 -
512 -src_compile() {
513 - multibuild_foreach_variant nqp_compile
514 -}
515 -
516 -src_test() {
517 - multibuild_foreach_variant nqp_test
518 -}
519 -
520 -src_install() {
521 - multibuild_foreach_variant nqp_install
522 -
523 - dodoc CREDITS README.pod
524 - use doc && dodoc -r docs/*
525 -}