commit:     11114bb4342fd577537151e6a6c9da8b5f368683
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:27:19 2020 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:27:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11114bb4

dev-lang/nqp: Bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-lang/nqp/Manifest           |   1 +
 dev-lang/nqp/nqp-2020.10.ebuild | 160 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 232725a4ffd..8897cf3f01a 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -3,3 +3,4 @@ DIST nqp-2020.06.tar.gz 3945129 BLAKE2B 
0cc378bd5be89bdc8e8b1a72ae64a8d93ccd1898
 DIST nqp-2020.07.tar.gz 3949070 BLAKE2B 
194cd52dabe307dab41bec8508a28d00f05c043c16d2ba1beec4a9da63be0d26be3303cb95647ab4f028985ce8913b16f6724f79a395fdf3a6878a2953d33958
 SHA512 
70b8fa525abc5b6d0749b3e1f090ace60095517d78f9ec84425f12496e46454f89e8f5ea0cbdd77e5f891a6abaa894c9dbc7be955652dfde1cc8d034aec237d3
 DIST nqp-2020.08.tar.gz 3951313 BLAKE2B 
0eda6b50268cd4faf49a7311e4d94d9846e223072a54d0ce5c4b2095abe47645924ce6a256edafd6301380ca99b8268a97551cbc6013210e9058713d5a8b1321
 SHA512 
6acc8d4b443b67a2731d30b4ed81c3ff654189dc51c463d7e4f30ca1a2ac4791b3393238b6370f8bc915278ecdb1bbc403427eb2292b41717ec7d01605a3de4b
 DIST nqp-2020.09.tar.gz 3951646 BLAKE2B 
9ec1d121f9dc276ad52ea22d43fb24fefeda009f648b64f330669d7f9aaaef599522cca708b3671f982969cba0a1346cc078c55c98247545408b3a929899edd1
 SHA512 
dcebf63ea062c0fec95d701b1f20c492c845060599f4524fa87758ce5f8e52f6eae9a409c31b238783285f30a497acffd97242dc2ca7fbe4b8dd20291104b261
+DIST nqp-2020.10.tar.gz 3954398 BLAKE2B 
5c44a20c3696bb596bd1d3088fba8db8c63ce6e612f00c2d24456dc7d908b12a214b4bde7e4e79505c39f6237a6f91578de47778185fa6cc3b6287c90e6c370e
 SHA512 
279715fa0b2012852cc31b9e7898092510a1ba76005576a3ffe38f9dc8e9c002a4161be8f0b66e38c501e656a8124a320dbf2c90c89f53e57d0950e1baa1ea2b

diff --git a/dev-lang/nqp/nqp-2020.10.ebuild b/dev-lang/nqp/nqp-2020.10.ebuild
new file mode 100644
index 00000000000..c41412d388c
--- /dev/null
+++ b/dev-lang/nqp/nqp-2020.10.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="https://github.com/perl6/${PN}.git";
+       inherit git-r3
+       KEYWORDS=""
+else
+       
SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz";
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org";
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+               dev-java/asm:4
+               dev-java/jline:0
+               dev-java/jna:4
+       )
+       moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+       java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+       clang? ( sys-devel/clang )
+       java? ( >=virtual/jdk-1.8 )
+       dev-lang/perl"
+
+pkg_pretend() {
+       if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+               ewarn "NQP is known to fail compilation/installation with 
Rakudo and/or NQP"
+               ewarn "already being installed. So if it fails, try 
uninstalling both"
+               ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new 
installation."
+               ewarn "(see Bug #584394)"
+       fi
+}
+
+java_prepare() {
+       # Don't clean stage0 jars.
+       einfo "Cleaning upstream jars"
+       java-pkg_clean 3rdparty/
+
+       # Don't use jars we just deleted.
+       sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+               src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+       MULTIBUILD_VARIANTS=()
+       use moar && MULTIBUILD_VARIANTS+=( moar )
+       use java && MULTIBUILD_VARIANTS+=( jvm )
+
+       multibuild_copy_sources
+
+       # This will pull in conditional java_prepare
+       default
+}
+
+nqp_configure() {
+       pushd "${BUILD_DIR}" > /dev/null || die
+       local myconfargs=(
+               "--backend=${MULTIBUILD_VARIANT}"
+               "--prefix=${EPREFIX}/usr" )
+
+       perl Configure.pl "${myconfargs[@]}" || die
+       popd || die
+}
+
+nqp_compile() {
+       if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+               emake -j1 \
+                       -C "${BUILD_DIR}" \
+                       THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies 
asm-4,jline,jna-4) \
+                       JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+       elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+               emake -j1 \
+                       -C "${BUILD_DIR}"
+       fi
+}
+
+nqp_test() {
+       emake -j1 \
+               -C "${BUILD_DIR}" \
+               test
+}
+
+nqp_install() {
+       # This is the actual reason we need multibuild.eclass.
+       # We need to distinguish the install procedure for MoarVM and JVM 
backends.
+       case "${MULTIBUILD_VARIANT}" in
+               moar)
+                       emake \
+                               DESTDIR="${ED}" \
+                               -C "${BUILD_DIR}" \
+                               install
+                       ;;
+               jvm)
+                       pushd "${BUILD_DIR}" > /dev/null || die
+                       # Set JAVA_PKG_JARDEST early.
+                       java-pkg_init_paths_
+
+                       # Upstream sets the classpath to this location. Perhaps 
it's
+                       # used to locate the additional libraries?
+                       java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+                       insinto "${JAVA_PKG_JARDEST}"
+                       local jar
+
+                       for jar in *.jar; do
+                               if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+                                       # jars for NQP itself.
+                                       java-pkg_dojar ${jar}
+                               else
+                                       # jars used by NQP.
+                                       doins ${jar}
+                               fi
+                       done
+
+                       # Upstream uses -Xbootclasspath/a, which is faster due 
to lack
+                       # of verification, but gjl isn't flexible enough yet. :(
+                       java-pkg_dolauncher ${PN}-j --main ${PN}
+                       dosym ${PN}-j /usr/bin/${PN}
+                       dobin tools/jvm/eval-client.pl
+                       popd > /dev/null || die
+                       ;;
+               *)
+                       die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+                       ;;
+       esac
+}
+
+src_configure() {
+       multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+       multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+       multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+       multibuild_foreach_variant nqp_install
+
+       dodoc CREDITS README.pod
+       use doc && dodoc -r docs/*
+}

Reply via email to