commit:     fc30d33320e3a0292e133843498fd895bca6bc3f
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 19:15:33 2018 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 19:15:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc30d333

dev-lang/nqp: Bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 57898ed160f..15248189600 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -4,3 +4,4 @@ DIST nqp-2017.09.tar.gz 3724208 BLAKE2B 
bcb1c8eb18d09945949100e077e753e3a4dc48e4
 DIST nqp-2017.10.tar.gz 3768260 BLAKE2B 
3058235d81948383429f7fa8ec5a1ceca098192051be176b82a17213da9eba0ee17995524ec267c945baee4f69b3afe7f0ca3ac74af6eec8b1fbb5872d467530
 SHA512 
fd43e1f7d768de58aae98afc031ad5fa5d28e767bac4f4acf913b356c107035c98c6551ad34f17f7a7a76269f96905882e348e5f821d7edf2cf7ffbee50798bc
 DIST nqp-2017.11.tar.gz 3771211 BLAKE2B 
816c521b0722479d385fc00511fc1f6b5472c03ad21a58f4dca9b61f5675b240d9aad2f1bb0e50de9c76d9da396f21d92adcdbad113aba5c112b26d427d2053a
 SHA512 
913b287e7a6a36ee618c10958fa5d521c8e35202784bfde4353ae0704e5af5915249cfcb36fe3de96fafe890eaa571545d6142ce99f07eadb1fd34929ee95524
 DIST nqp-2017.12.tar.gz 3795477 BLAKE2B 
cf50ec801ac2d7e30588a2c7d1109d5d360deab4e51fe329c78a681cc5cfb418532faed82aa4eeb8eeded409913baacb9204273b305831f7d50fb587c08fb5cc
 SHA512 
0255747ab1719c5a1b084cdb47d2c3fc08bc6ac2f081e67297c7b72e723ce7c3ecf3c51d096cb9e0d370e8907ea8b233c03a3d484dd16d1feef5db3cb1138137
+DIST nqp-2018.01.tar.gz 3798898 BLAKE2B 
5dc492bc5561a674d3faabb63c881ad97bff3528bc3f8bd75caa7f2e78aa4464849f326c611936106c6f14ca56f4de5f4575407ab134d4218409829c22885b3a
 SHA512 
0bfec280ed2c70bbf25b274632e830838526fef1e8f8c08387b1e79e1ef739dfaafe67dbab17eb24cf33c1b2aa984029dc0740fcc43e463e92f908dfb2360249

diff --git a/dev-lang/nqp/nqp-2018.01.ebuild b/dev-lang/nqp/nqp-2018.01.ebuild
new file mode 100644
index 00000000000..558b645a275
--- /dev/null
+++ b/dev-lang/nqp/nqp-2018.01.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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}/tarball/${PV} -> ${P}.tar.gz"
+       inherit vcs-snapshot
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/";
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar 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.7 )"
+DEPEND="${CDEPEND}
+       clang? ( sys-devel/clang )
+       java? ( >=virtual/jdk-1.7 )
+       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=/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