gentoo resync : 16.01.2018

2 files changed, 161 insertions, 0 deletions

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index d5bc1ccc5493..5ad3deb55edd 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -3,10 +3,12 @@ DIST nqp-2017.08.tar.gz 3718841 BLAKE2B 85e9e6450201af32dd89cfff4d85ecfd9fbbf0e8
 DIST nqp-2017.09.tar.gz 3724208 BLAKE2B bcb1c8eb18d09945949100e077e753e3a4dc48e4e3e2f26fbe12f1fd69d079daa0c62ffbe8957b1539d3d81beadb8b2f1216b3b57def458f786cde8882795421 SHA512 a932f6d5ea24ad1857339cd5d7314f75b5bb08628df63e180c3675e0e5a8d04fe12add1cf2d04c55e0454bc4c0e5e59cfd57f793c242dfa2459f06ae8a2097cb
 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
 EBUILD nqp-2017.07.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.08.ebuild 3611 BLAKE2B 8ad194ebd4d744affa19df84d800637d5a486cd8b9f87be496d1328d80a62ccf82f78a5567775e3e6a7eeeef9f8abbc16f5143c5ae49eff12988b3a40d727568 SHA512 42f9651aa22042a571e77c13c9e5b46402cc4ff7cc71579daca171cecee7c7250eab476825693a5921e1edd66f44987b9bc096e046e570037ab2144fceab01b3
 EBUILD nqp-2017.09.ebuild 3611 BLAKE2B acd8500829423373c89bfafa1389f5559494d2fa6abfdffd0881924cbda52364c4dbbdf742a1b591512fa689e799e2b360d1e1725562020f1e4e2026b376a750 SHA512 8271504114f3dca61e290006077957063d624b8a967c0c67a8b32fb28e217e5ccc895f1d63d4a95fc10e491962b86fd70ba7a420643a988788da2f30bb032edc
 EBUILD nqp-2017.10.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.11.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
+EBUILD nqp-2017.12.ebuild 3609 BLAKE2B 795b4e2004593fff7df1cd1348862e4bed63110c84ffc95d055d0940b60330ba6f421a46681c885e5d4802e512f55c9a555d46ef73ad6448fe327514857fbc77 SHA512 6246e11f2c71d5f438313f3594f8659ea6d88631ee6e3d03079a5b985be3630465dcd46aabec11c7a49f22a77f1148dde4cf59352c6703f7036942bb55877e69
 EBUILD nqp-9999.ebuild 3607 BLAKE2B f4c87264d989c591b3ae834e455b7bb84d14bffdf667a553ae5709d4a2340eb9450331f6077956460c94095f211dd7af33431e6c6fc8bec7f19bec7555c86e4e SHA512 c0be49582eb04c3a80b4a9191ee121018adb177fbd379083231c9157eb8fb051d447f0e1c5a05214f40d52c30fabedb7d2a72dfca7625239822f1a6119dba68e
 MISC metadata.xml 747 BLAKE2B b635e6983ae4f77695acc0c8770d252d5d60dbb2aa8650002e68e768051f67251177ad760573c4c842b6ab297ee1ac68d1c01151dc599873e6a3a751b8d25a03 SHA512 b86ede9a0dc7587f24308ceb470666aeabf7cd96f2da4afe05195a2b74c1836826ddf269a6ed00f0bfb190c9b241a4d500940afa9060913b8f724989b20a68e2
diff --git a/dev-lang/nqp/nqp-2017.12.ebuild b/dev-lang/nqp/nqp-2017.12.ebuild
new file mode 100644
index 000000000000..2770ae13aec4
--- /dev/null
+++ b/dev-lang/nqp/nqp-2017.12.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}.1[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/*
+}