7 files changed, 285 insertions, 0 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 332550f495ff..6306364bf3d8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 6da3fd62ef11..bdb8df08d2e9 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,6 +1,8 @@
 DIST MoarVM-2024.02.tar.gz 14951164 BLAKE2B 9416cea0b454b29c6d5662090428d790ea437bca1814a084a2c1478268c0eb74764205bca892b5e8de820b2201df154b92503e6243eb4a927a822374a5c09f86 SHA512 e629edb3fb365fd4cd988d9c08d46ecaf002156452e22c3a0c716641eeadb5b7f0434de4e2ec3ce9c8dc354280dc419d716382c160d400ba3970decffc996ed8
 DIST MoarVM-2024.04.tar.gz 14953770 BLAKE2B d6ea26bb98a1a6b2c3e6f0184a70c670830eb0872238779e9ce763f8c798bce803db4c5ba488c3f18bf5cf65a8d529fea9268a270458a33fff21ce10c74ee206 SHA512 874b22347fce3018884733ef734db0f09faae89191c2d37d7a15a897f8ce88ed9fbbd69768267492e6d1f019035ad224eef844b75e0fc1634cffd4b059314af1
+DIST MoarVM-2024.05.tar.gz 14956570 BLAKE2B b4a6516dacf871e8c0fb9eb7813322310f038394225f574bd69096c14448f53c5be82eb8b4207361f55c804e165c17b9d63f78efa821d523e3195a31239a8c9f SHA512 703c1418ebf587bf16173e5711f41d8079ea605731505f5699590d3b355e3a54921a7cbab1bd22a2253ba4c79ef4b92f9989646b065239fb9e8450c352fd4f2e
 EBUILD moarvm-2024.02.ebuild 1458 BLAKE2B fa2c83706ff582875199707fae7563bebf66c7079c0b7a8520df715553da2e32f551a2e912a8e1cdfe6ab03f5accb57a852be82f22c136436aecbefe7ce6d7ee SHA512 a7cfc6c83239aeb394b87f0b7149f40001075f4c26e2b935fccd7e30113d6e2d5dc8aec2182cea2f36eb66aa8dc9263b850eeba024910656ba7ae0722f55806c
 EBUILD moarvm-2024.04.ebuild 1458 BLAKE2B fa2c83706ff582875199707fae7563bebf66c7079c0b7a8520df715553da2e32f551a2e912a8e1cdfe6ab03f5accb57a852be82f22c136436aecbefe7ce6d7ee SHA512 a7cfc6c83239aeb394b87f0b7149f40001075f4c26e2b935fccd7e30113d6e2d5dc8aec2182cea2f36eb66aa8dc9263b850eeba024910656ba7ae0722f55806c
+EBUILD moarvm-2024.05.ebuild 1458 BLAKE2B fa2c83706ff582875199707fae7563bebf66c7079c0b7a8520df715553da2e32f551a2e912a8e1cdfe6ab03f5accb57a852be82f22c136436aecbefe7ce6d7ee SHA512 a7cfc6c83239aeb394b87f0b7149f40001075f4c26e2b935fccd7e30113d6e2d5dc8aec2182cea2f36eb66aa8dc9263b850eeba024910656ba7ae0722f55806c
 EBUILD moarvm-9999.ebuild 1336 BLAKE2B c526a7646806021b39ef4ef2d7f5c8f4446079728028e3303e272cafbfb22f4efe50ce7aef01cff47a430291448a3c7e5176840bc7d889f449c4d68667b7decf SHA512 9814284f2e8c1a0a63f601d17664253260e8c8b29b08f6d4488bb42b00f74ff20550847741f3bf1f5b22149c8b9333f1a7045a008a26159e0075802f1c016d0b
 MISC metadata.xml 803 BLAKE2B ae42152bd02136d44d034e1ae39e457893d720b496681234e1f804c0144d4023dec76ba9edba30df269bac7b9e2cd353b7197e3d21336bc92bcec3fbd877facd SHA512 93ba240a87a853f4df3ed542c0468cd820bd75935253a77f15259293269e1726c71cadcee076550f622444c032d359227f5377a97595e88ef6ef10d034d79aa5
diff --git a/dev-lang/moarvm/moarvm-2024.05.ebuild b/dev-lang/moarvm/moarvm-2024.05.ebuild
new file mode 100644
index 000000000000..e437c851b138
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2024.05.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Raku"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+	>=dev-libs/libuv-1.26:=
+	dev-libs/libffi:=
+	dev-libs/mimalloc"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	MAKEOPTS+=" NOISY=1"
+	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
+	local myconfigargs=(
+		"--prefix" "${prefix}"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--has-mimalloc"
+		"--libdir" "${libdir}"
+		"--compiler" "$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+
+	perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index d2e4c108016f..a8acacb2d703 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,6 +1,8 @@
 DIST nqp-2024.02.tar.gz 6041352 BLAKE2B cdf1863f80d3a2d64fea3d6b783c91ad3fec44866d0b5a1967e0ac682ef3942a3361c4a4f355a11af938846ef47404df4a5d39fe46ebfef121ab2118d1444e64 SHA512 4dd943920900f0b58385b0a1b7dcc732557a0215975868f322860ec204cbc43d081ce292beb4b2bce70863684d3ec1d981fb809c4558755e791dd7cb0208e05b
 DIST nqp-2024.04.tar.gz 9726771 BLAKE2B 5582aed194438bc57b862e6b1f14b8fdf1548c5e0048e69315e411913b049fec6df640b95bbd0df3e5b541554473fe207c81dbd083d477f12194c22d22119be3 SHA512 988518e5db2d7bdee6ed55bb337e640d091f404d6cc2b2687e9b542cc91ea755add415b40e8b3ac9ef501e150d2026867d0f1f1bfa32f1767e01ec30ae050dd0
+DIST nqp-2024.05.tar.gz 9727311 BLAKE2B 13303d2fa598628ab3cdcfb2a4a9a34b16aa1b6b7c73883114b23f1d969fc0bbadeb8ce692ddfaadb082c625be9d6cf8a291500fd953b2f43efd2995cd91a1cf SHA512 82b6277ac728b89f3c4548c735484aac21851140613471ba559a13db96fc90c13701ece0689ebd548f4ec91f3b1fca3e92f7a6772d7872c3943d5695222c235b
 EBUILD nqp-2024.02.ebuild 3276 BLAKE2B b8b13bd9958d4506fb5b632ccc4b1811473337c50b0fc8dc5e410dad234ed6b8c300a77649efb2168e409e89ebf52a58a7b3aa69271162fa109dfc0b3d331e5d SHA512 870dadce58f644e8266ce3df8888602120124c29a7c027fc20a533a2033a96080f20dbe0a5cd84b771391ecd751d9f43709560d3c8c23a73abde2445fc3f1a4c
 EBUILD nqp-2024.04.ebuild 3276 BLAKE2B b8b13bd9958d4506fb5b632ccc4b1811473337c50b0fc8dc5e410dad234ed6b8c300a77649efb2168e409e89ebf52a58a7b3aa69271162fa109dfc0b3d331e5d SHA512 870dadce58f644e8266ce3df8888602120124c29a7c027fc20a533a2033a96080f20dbe0a5cd84b771391ecd751d9f43709560d3c8c23a73abde2445fc3f1a4c
+EBUILD nqp-2024.05.ebuild 3276 BLAKE2B b8b13bd9958d4506fb5b632ccc4b1811473337c50b0fc8dc5e410dad234ed6b8c300a77649efb2168e409e89ebf52a58a7b3aa69271162fa109dfc0b3d331e5d SHA512 870dadce58f644e8266ce3df8888602120124c29a7c027fc20a533a2033a96080f20dbe0a5cd84b771391ecd751d9f43709560d3c8c23a73abde2445fc3f1a4c
 EBUILD nqp-9999.ebuild 3276 BLAKE2B c8d0e4a22455aca6ef18384d27f7df0dbf4d185deaf4133c460497a317637657b33535de52917bff8627d96e59b83e0c196d61feabe70e52e4ebfe5a9defe8b4 SHA512 85412bd68704695e36f4a634d0097dc601cd7f319e2ad26c74833f5fab04f30b3eae3177461e6b4eb8000c7a94daa904ea37ed4166e25ac11522648d73b043ab
 MISC metadata.xml 517 BLAKE2B 384b3622592cc6d5fd94f2f34bcb69b00ce00bbea6b811e56d068a8882bcfb78fd3eae9f7b28173147b3235b942409f7b19d45044bf63bf9dea5b8b5f7110ca8 SHA512 bf89e6907f728f3e471a9a0fff41004cdd3cf50a92d8a1a262220bd590ae6a489f0b51d541bfefb15c4aae378621135a354ef48b768ea5b182e3fca6af6c3cb5
diff --git a/dev-lang/nqp/nqp-2024.05.ebuild b/dev-lang/nqp/nqp-2024.05.ebuild
new file mode 100644
index 000000000000..efed9b5e0109
--- /dev/null
+++ b/dev-lang/nqp/nqp-2024.05.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Raku 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:9
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-11 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-11 )
+	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
+}
+
+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}" \
+			JAVAC="$(java-pkg_get-javac)"
+	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/*
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index dde9122e584e..536638d110ef 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,5 +1,7 @@
 DIST rakudo-2024.02.tar.gz 6879828 BLAKE2B aa361c9e21c34cc5c737390ab6b1b8828afaa6aafaa604dbde273d68084cd0cebaf9c8bd796a394844f05b7bafc4f5d2db8a80a7bc1be8baab52b7a7f858bfa2 SHA512 b9bfdcbaf7daa80e6dfe1fb96e68482d2b110cca03067ef4e3e12270897ef0d53710d90fda97254c4cc012b3cdc4ec0c5d4a25facc5a0224a7579b96f9cd7aa3
 DIST rakudo-2024.04.tar.gz 6908669 BLAKE2B 681a13e0fcefd8a0187f99a4bd92f72833a74870933497f6cb8de0b2ab3ddf07ee4c492760c53cd623f6d7afd3593194748882400ea94e703363c58fc4ea3d2c SHA512 98b4dd35456df1774a320dbd53ffecc72323d91c260ce1264b2056624e8cdf8a47cfcd89b775411f8bf3fb1f1b4725e2b75c7724c5891a4d366e5ba3f2a11cd4
+DIST rakudo-2024.05.tar.gz 6923643 BLAKE2B 9ec3796a2638489dea1bea510e1fdb6b1877011944dd50e2a8211f5b2d564ae7767dac3dc6510ce281c0df840aea3c1888b1d13cac461ecf3c5b031e6d6d27da SHA512 12b0c61c3c13fbb80bc281c4fa2c9e2ecc2b9f24b11501ff05fe82f3208c8b2adec94f2181ca0926f40da4f27d611aa2420304c837d03a9f597925b78f837b82
 EBUILD rakudo-2024.02.ebuild 1598 BLAKE2B 513ea2ba61a1160bcbdd33457a499c9264e7366cae7cfef681440cfd789ea7da5815f50016bb96a275c1ecca3f9b3bec5bfb2d8acd0372ddbaa265ba33103a97 SHA512 32fb5f6ea2fd9deec33076124d51fba1b9fa6f94a4995013840faafc64691d44290087e9c4ea5507fe2fa4898f7e25e3544102fbb30ea7d3bf481b33eebad470
 EBUILD rakudo-2024.04.ebuild 1598 BLAKE2B 513ea2ba61a1160bcbdd33457a499c9264e7366cae7cfef681440cfd789ea7da5815f50016bb96a275c1ecca3f9b3bec5bfb2d8acd0372ddbaa265ba33103a97 SHA512 32fb5f6ea2fd9deec33076124d51fba1b9fa6f94a4995013840faafc64691d44290087e9c4ea5507fe2fa4898f7e25e3544102fbb30ea7d3bf481b33eebad470
+EBUILD rakudo-2024.05.ebuild 1598 BLAKE2B 513ea2ba61a1160bcbdd33457a499c9264e7366cae7cfef681440cfd789ea7da5815f50016bb96a275c1ecca3f9b3bec5bfb2d8acd0372ddbaa265ba33103a97 SHA512 32fb5f6ea2fd9deec33076124d51fba1b9fa6f94a4995013840faafc64691d44290087e9c4ea5507fe2fa4898f7e25e3544102fbb30ea7d3bf481b33eebad470
 MISC metadata.xml 396 BLAKE2B 43b55c331967d55e0a5c8d2dad7399c20b4104494cf3310b5a95dbef537d07908135c7f9c7829c737f64466660056de8c5656637b54079fef0f90ea4cfef5f1e SHA512 163828a65041f6d74931e32b6edf8c58ddb59151f8c68519165e81003886ce67ff4bcd21e69dc8a1fb96e4b8189fb611dcf8b9d73a52b257ccc24de516185fae
diff --git a/dev-lang/rakudo/rakudo-2024.05.ebuild b/dev-lang/rakudo/rakudo-2024.05.ebuild
new file mode 100644
index 000000000000..2af8fe10b2b6
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2024.05.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Raku programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.9 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.9 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}