gentoo auto-resync : 06:01:2024 - 12:54:38

18 files changed, 320 insertions, 450 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d253d8066e6c..05217a4e1554 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 5bbdf6220ccc..46cecb389f7d 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,8 +1,10 @@
 AUX moarvm-2023.02-fix-build-clang16.patch 1050 BLAKE2B fa384226d7eaa5fa5dfe26c51d9de6fcb355af8e808097c75839d3ca8eab8919391c5b1cde7863899a51c11a8237285fd3d0d6ae26a77a0c02cda6b008a6364a SHA512 2baea3fb8787a87cef2fc298e1aaa01d82143942e1cfdd0891609f2fbf51b8a54457fd3ecd7ad7d0e25a805db5f86cf6a8df3c25e9dd66f7c1d112a4cecdf516
 DIST MoarVM-2023.02.tar.gz 14917710 BLAKE2B 57ea0a3871f51f2cf2bf7f7d9d70f4d00052cf3ab255916fc73eb33fabd0e96e44155582e73158cf98042705817b5541f3fea0d557b09e38ad6e45cad14f172f SHA512 a3dd172a84aba72df4bb9228f50eea3c4d74d4db285b06f19dc4502523f3de09580ad8a5525cf181038928263e47f72b0187a5d57dba019f18b9783ba4247203
 DIST MoarVM-2023.10.tar.gz 14932372 BLAKE2B 2c6a12129d85d0deb85ea328c4cfbdf0f9df40cf2eba7e1ae96a453af9fdc71785d867ee6575eaebf0dabb9f56a856ce88073d01a6af3c0864a3d8cfd43c408b SHA512 1dbe4e0d29f665d95b96d7acd0954cf27c76872c78b66c7ec30e03789bfef0c36b658677be51be25cd5476c5ff278e15c0c610f8baa00a340b1c1725d0c2a5c3
+DIST MoarVM-2023.12.tar.gz 14942980 BLAKE2B f42caa33cadf2b878c1d0de0994c32d18b81b6e56c684a7ccee54c6abc3ff6abaa4f1e5420f2320aca185d29b2fbf02ec81abaf3eb5e334a5c903c3475d55db7 SHA512 9e756e8248cd8fd02efc3d14cd5e0a32cfbb7050a96d94d011009aeb9ec1ca5e9646a3c25b8741702b88abf3faf6aae43df43ca719e1ab17478c6d1984720f59
 EBUILD moarvm-2023.02-r1.ebuild 1402 BLAKE2B fa951e9d2f13e2df7846f93b5da6034176e4f5d789e958b877a07712f9eeef18a9afcd3d09a1c743916cdd1e3b0b698a44c38f5c8905d3d186ba10e3a0c8998f SHA512 b7a87557f65637070e6cfcbbf643dde183efde90a866cde91ca95bcddf5308de29eb9ec7fd6e42958d524ab47d9da569751ac165d600af799bf734e0c9611473
 EBUILD moarvm-2023.02.ebuild 1422 BLAKE2B ceed896054839c4acc8ee0b7b84dad8b35a02e8108e78bc6b89c544e440cdeff49a09b23a594b7e30275d815d63062c338cacf2cd94cf874ea94efaf94a52ab7 SHA512 9e825f0183aa1f179756731a449934c7f0e54932edd2fe35e7e0e4f20e8590366441ec083a7cf140febefda47c4921b066bc9cd9980d1215ea2efcf40fb7d694
 EBUILD moarvm-2023.10.ebuild 1458 BLAKE2B 5b849154f3cb006f8fa211adbde63497338629e631c663b9bf8238d5cde0a56032ce83a3d4ce4ef37fe5fd5e08a441698e508509cdaedb4247d74b2a78fc9350 SHA512 42d48e3877f5cc9dc55cfa02f6d90759f4e6d29228a6db5f46df7aed5d17b8d616de4eb3fdd20b023cd5600a9cc9c847b40a2591491f391dc51292038b0af2df
+EBUILD moarvm-2023.12.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-2023.12.ebuild b/dev-lang/moarvm/moarvm-2023.12.ebuild
new file mode 100644
index 000000000000..e437c851b138
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2023.12.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 ff5d5c6cdd6b..8f8792707675 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,6 +1,8 @@
 DIST nqp-2023.02.tar.gz 6023282 BLAKE2B 546ef7c0039857a2be07b2a0601c32f5f8719674a64f599dc1c6faa34dcc12bf7b205da9356c3c2632e01eb3cdc22a8c6bbb7d70180773d58c7a6989c56df2b7 SHA512 c71b7d5b0237501a10b30985dcd48f17f9741dc09360b2a98c24134cd1dde8fbb868eef39d97aba2ba031b52e06b5220095792c834d5d154218e45dd1af87cdd
 DIST nqp-2023.10.tar.gz 6023223 BLAKE2B 5d4a992ee85171566848aba046c8238e786edd0fa398334d21e9b27f3863d2ea23834e41708534bc5964600ae134db60ca46e487ebb0a294152763805754af17 SHA512 843313c6830b4049655f125379c1303b912d198cdae25cc24862b8cef5ab449f82495f1160784e1741136d7919cfd8285c830479f70ade58a5431d410135f691
+DIST nqp-2023.12.tar.gz 6023121 BLAKE2B 2f5f519d05ca68a119e544299418d7b9c5c17f4cd29d63dda80f0ae57a861cbda9ecc8a1fa18807c78cce86c7cce67a107fbaeb83d47bb2ba0bbcd8070413950 SHA512 0f2f8d74e9b99288d3354c39c8faaaf674a570b36c1ce782f9b0944d348909dbdddb9eba2b04f01a8c8bdaba7190cafddc9459f07f16986bcf37ab4729e994a2
 EBUILD nqp-2023.02.ebuild 3276 BLAKE2B c8d0e4a22455aca6ef18384d27f7df0dbf4d185deaf4133c460497a317637657b33535de52917bff8627d96e59b83e0c196d61feabe70e52e4ebfe5a9defe8b4 SHA512 85412bd68704695e36f4a634d0097dc601cd7f319e2ad26c74833f5fab04f30b3eae3177461e6b4eb8000c7a94daa904ea37ed4166e25ac11522648d73b043ab
 EBUILD nqp-2023.10.ebuild 3307 BLAKE2B 4e23cc65ffe1b2aad17df3dfef9ef93d459df1bf42e293f6d6d55257f0cdaac52f9e23fdbc665ade54744ee9a9a7c9c86a6aad92ff558c6335f6d3dd8a99a343 SHA512 aa09bd17fc2657d4ca6238204209bde300eab047ca2159b6b9d0747a4c0b9876844719ca3047660babef16ec0280d01fd7928023e8fffe966823d76c35d1eb2d
+EBUILD nqp-2023.12.ebuild 3307 BLAKE2B 99463f83acd77c6d24c17cb03b102343f83b083b27598c99ec1fa6b69df517f51c3e81903f9151b9e96abfc88f9789697189c0ad195be03ec6d51ec9544038b7 SHA512 7b5382f5e12a4d3d46bc7f02376bb9afd861747a0023985b0e9d5244bea268f7bf0158f47e1263b5c8e0772f044cc8328ca2136784d50d006c1a206f1ebaf7a7
 EBUILD nqp-9999.ebuild 3276 BLAKE2B c8d0e4a22455aca6ef18384d27f7df0dbf4d185deaf4133c460497a317637657b33535de52917bff8627d96e59b83e0c196d61feabe70e52e4ebfe5a9defe8b4 SHA512 85412bd68704695e36f4a634d0097dc601cd7f319e2ad26c74833f5fab04f30b3eae3177461e6b4eb8000c7a94daa904ea37ed4166e25ac11522648d73b043ab
 MISC metadata.xml 517 BLAKE2B 384b3622592cc6d5fd94f2f34bcb69b00ce00bbea6b811e56d068a8882bcfb78fd3eae9f7b28173147b3235b942409f7b19d45044bf63bf9dea5b8b5f7110ca8 SHA512 bf89e6907f728f3e471a9a0fff41004cdd3cf50a92d8a1a262220bd590ae6a489f0b51d541bfefb15c4aae378621135a354ef48b768ea5b182e3fca6af6c3cb5
diff --git a/dev-lang/nqp/nqp-2023.12.ebuild b/dev-lang/nqp/nqp-2023.12.ebuild
new file mode 100644
index 000000000000..e3b54ec169ae
--- /dev/null
+++ b/dev-lang/nqp/nqp-2023.12.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RESTRICT="test" # always fail
+
+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/python/Manifest b/dev-lang/python/Manifest
index d7f78fb7709e..252eff099032 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -15,19 +15,19 @@ DIST Python-3.8.18.tar.xz.asc 833 BLAKE2B bc4e989748d53c6be7040e78d9f1852227c6a7
 DIST Python-3.9.18.tar.xz 19673928 BLAKE2B 97da9bedaf29101e5df82199ac3ee12f1da74d5cc89de21ff1510c3f6d34d7f9194489e79855f1ab3c6f26768738e784cb7231c1a692fa746edd21d35558bc4e SHA512 aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7
 DIST Python-3.9.18.tar.xz.asc 833 BLAKE2B b2160eedf7a7529c379ede5cd626f2d1e36db65bad8c8968adbc2940e597bf0e66f4872078c6543c69aed9b7f38b41d922fdc1cb8046738c1d8566a3f48da7d3 SHA512 dff9a86df2b0774b68e7c762bacf05e2482dbb218301acfdc9128fc600bbc51c97a3a44f6b7cee87bd4e153bcb4a0af3c98109560d0c7861b7508edc9ae05ea1
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
-DIST python-gentoo-patches-3.10.13.tar.xz 13996 BLAKE2B 0123a18c8c39397ac03b1be1d243d8ae4da9f62888f409157bc1781285c9c6cd3d9ec23f1ae7ff0e0591b3dd2934ee366b3eb235e7cc6663afc9d617c4fd42f2 SHA512 ddfc830d2ced508a64e202a6082930f53edb48411c19cc9f364b29977ecd5a4f052d0ce953bbfb7fdf26072acb2836e0b7d5ce55f941955f2039551fa1f48edd
-DIST python-gentoo-patches-3.11.7.tar.xz 7560 BLAKE2B fa836508cc85c3fd5e9bfb61d4d214b0d23923e4d29b87d30afa7a5a4d8fa23d5abb8ae8e1d571e301318ce14707a5538228bf1f2bcc8dfdfd5788e4676c0c0c SHA512 e3f94281689f500b41cd707b2881613c0c6a1be3dad2fbe1fc64330b249bce173d50cdc6e2f656daa7920b06795b7a555c1b08982b889b48955356e66416836c
+DIST python-gentoo-patches-3.10.13_p2.tar.xz 15236 BLAKE2B 1b60a9ec0973de0f5fc7454e016b01c2a03e55a4515345ec86bf20e129018809908493847f55346d0c07ed6878ee2ead32f2b7dcbc25a6902d1494f718480acf SHA512 1db65a001fc307b48d034ad58c7d9aa4561a0e01b46fa1027ee730b2db1652eb6f02c73df6a9e2b8545e76d3b0541706ea32d423787f99ed83f86463951e9e81
+DIST python-gentoo-patches-3.11.7_p1.tar.xz 8364 BLAKE2B 246da406e6d58d85ab2ef79dd3a018a134e473f90d42f8dd9274629f998a6129f3b03da228aa5e65c1b4508a71979ceb1f752a28066c356f813be21c30a40f70 SHA512 c5c1448a2e9b15b8084125e07cee288b667267779d89da8aab9df4b1d014739ba9af4d09e51b3cdc37e8942821d7aee0d1998e55820b67b83ef654d0a442767e
 DIST python-gentoo-patches-3.12.1.tar.xz 5152 BLAKE2B bd1470dbdb4a3336f499534131d9f67329d6a1f6378b61592f6168d9a2500d9d9d65a77167065f80c38745fa1464a2073eac3e4bc0e5c096eefbbc8971a077b6 SHA512 2e608940f2f8c3a4be2699365acd1967d887c7895e71b173327dfe91ea41b6fb10a83d0845b2caa8b59884aa73ea73e49535d7805dc8b50f63b7fcdda67b438a
-DIST python-gentoo-patches-3.12.1_p1.tar.xz 6064 BLAKE2B 8238f10c1ebdd82fec4ca70cdc9ea59711dab06c687315044580c853502189eb8c00f14213eea507921659c9c6a6c14b4f432b6762fef5e10a62b866c27ac943 SHA512 44e6859a312cb5cc080ac5a2bc9c649fa5cd9a137b85c3e8dc312e0a0027cdc917e150c5c3ab4b4bd9836b6918b3e53a12e0d4406bdca124ede10d63e69e8ca2
-DIST python-gentoo-patches-3.13.0a2.tar.xz 4360 BLAKE2B 1c55b3ae512a2c04bab00fb3a47faabd2726b6cd7a082d27b4c354ff334c22cb7296d9bf4ca531fc91e2d31be8b1f385de82081980272bca9163bc208b54fea4 SHA512 c7bd4dc3f8f698d65ffe54f46432903e3591687d997b1f6b7429bead461652d9de9dea3515cb0063a662d14ddcf7916199779d61edf888cc24c01d89f1fafbee
-DIST python-gentoo-patches-3.8.18.tar.xz 32424 BLAKE2B 2e0b6e1c8e3df666934ba283214ca1577b01140dea00513f6420b0255650002e4bc4cb142076620227cd430bc2547123fd392883285886e543ef72ca466f8ea6 SHA512 b005f1054b726fc8c82a50b006309de64fb7858fe5c22cc7b160687d059a7859ec9388706b74a0e6c1f42301bed071dc639eb8cfae0d7c5eef2f565c63cc2d29
-DIST python-gentoo-patches-3.9.18.tar.xz 25044 BLAKE2B 1d9ace5c5a0f1c15bc23595cc51d64b4c2b416552cdaaa960c3e34360aba3e7029a06e2a077212c68fa7aee4fd20f649a3b0926bd4ebb10e529e8350ab051e63 SHA512 bc180c3346dfae60a7db221d114146ee83409bc42092171eb05c83de528bf5f0e5654d1441f40ba839d0a98e866a5b43452fb7a72047c837497620a12097b8f5
+DIST python-gentoo-patches-3.12.1_p2.tar.xz 6880 BLAKE2B 20f0ba78295cc64743f6842bccc7fc684389b8800c3884572be64b61516ba38c873104612467ffaa2a84653fc35184a7d7cd77d1f6ca6e19faca0b05bce1417e SHA512 653104144c864a0c0a27972f849988833540641d24f02bf14096e99e5a9c2d41df31f5dd0d1ecbbfe36419588eefae8f2e0a4b49bff3e6d96bd8b3cf0e3b5425
+DIST python-gentoo-patches-3.13.0a2_p1.tar.xz 5176 BLAKE2B 87e278c11fafc69df918b4c105dfbc3d9ca9ff805d3862b0101ccbb0fd7614fda3460ba4e6304a0f62d0c96756a82ff046ca4a5b02d75daa3325c8e84edc99d5 SHA512 5a2692f8d113a67502b60450f6fdb0635f4f350877766e800e897aa943222a58991580dd8e1f71c9f2dfd3c381bb13fc30add9289cd7ade6fe184f3a5ca3d587
+DIST python-gentoo-patches-3.8.18_p1.tar.xz 33160 BLAKE2B 53c7d71f2cdcc21e991a9d61c8cb8833212d144d145d5949c5b28b62080121250d7633f477453743426d6e0ebdc9f6bd6648d4ccac8dfb2d559126455d8b1da3 SHA512 7fbadb2468711b5ecb8a9fefcf4dfe567df7f9b038ec87f37095d02589e7debbf5a8ad3f759d95b69ca60ce9fcd3ccf4aecde6592ed69c030cf51250935db052
+DIST python-gentoo-patches-3.9.18_p1.tar.xz 25792 BLAKE2B f24ab6d3443c2b39a2fdca5810790eed51d2d42c93a3b41d75cad6b6c99ebf709f598eaa9881858e13ad102867d97a159f3a6d97a42569d5183de6118fb953c6 SHA512 be0c60c65d4c982cd8b934d14b69f5f41ca9f0d6c51d6bf195d64d0a5ffff3d359edc29a6a2f2808450c896d2795cc773c9f31680970205a37955134be50ee79
 EBUILD python-2.7.18_p16-r1.ebuild 8595 BLAKE2B d8bce8a565eecb565ff0c872bd5323261a2f0bdf31f98935df50fcd0bfdc22665e550fb3dbcef84f8b9eb680e34586e86804b68310c3769997414328fa2a431d SHA512 2fd4abf3f45a782cf75bb02a2eae5330a2463186b1f388ad85ebefc757015d7f38ac4f74c2995d46e847ef68176d3f9035179e249499aef89a9bbf0d459e8d89
-EBUILD python-3.10.13.ebuild 14209 BLAKE2B 60ba543301b6a729508610e9584aa9eec040aea06ee8889505c8b4c87a2595ab4d59426e514eab6aa6cb57c7760768c639b53c31ffe6580d5571f3aa6d0940dc SHA512 445f56f2a0af94adfae8b1d0b4bccc2863fb3cff24e5050bfa98f45b2b971c0560d6846474cfe102f6f4251425b567c70a20cd52134950c8538d65959607b313
-EBUILD python-3.11.7.ebuild 15092 BLAKE2B a6cca39bb204531458cb0e1239432e6316caa345bf49d14674e7ad307c953a0a2da993ca3be8b5690f010b0f3c33183e670a4b9e0f96498159bb9a5f323c1d1e SHA512 708d5ffbc32a919ee9db6983b91d7b48a10fea8535f7a4b9ca624c109b6d8d259952bde4b74ebc81e3349c08af0c742b135ba67a6ff60bc5530082bfc5c3ea62
+EBUILD python-3.10.13.ebuild 14194 BLAKE2B b0865a7534bc888bff0edf112021cb4a691965f304792c5816a0793695b63ea1e03ed1864a4d669b3663495b333dabdc996ebc60f5df6a25dcde0f39e306dd82 SHA512 4f431b4541a4ff891f7b449093ef0dd240ab2a3d63aa92ac2a44d54199514431c17ae1c58108685f68cbdd2e3dbe21ced5f5d7aac1faed4adc9c56dbaddffbfe
+EBUILD python-3.11.7.ebuild 15077 BLAKE2B c88d5d198acf89ff1fbd79ad0380440aa83b35c323051751482b4a34af206a20256cdc5bca9bf6ca58df76384564d556e15902b7ebae568890009b1b4a17d0ad SHA512 ee8aa2f7346b9b91b62ad8b4c948479c60fa3d1d6bcd625e9e93396fb85952de484729bcbc80aa5d639f11b00b24fff5718a4782413da4f5b48a051616dea110
 EBUILD python-3.12.1.ebuild 14665 BLAKE2B 6f5d08274a07a921ff299191f193011b7b3af0166ee7ecaa85375cac97e7222588235ec0df89816e0de4a9843d037d7d935ca21097e2cf65171e2610dd64c62f SHA512 1388c9d7cf9391e127bee6c753bed1c722972d3e9c12b8dd4d423b7047e416c3364a6253e00d4e9073a7c5bca31a036ff43812a9a34db1ae26a53e0096d91932
-EBUILD python-3.12.1_p1.ebuild 14661 BLAKE2B 3e2473f2ce5303e968333a30c13e2aa219b4ee83fa2a94e92c97e41d4bd507ccec61500b3ba13f2c8e0eb8cc640d5df05912a0c15b66b798ca103b501dac5854 SHA512 a273ad05286315b6988ad330eecf3b54a2410e08749fbe54995deda0b086fca93da1335234dfbdf4011daaf5dee4c9633c1dd4f8dcccb6e21df6f5df46b7a6a6
-EBUILD python-3.13.0_alpha2.ebuild 14487 BLAKE2B 24802c81749b533c46fb02356529a75b1efb1b18899788f8296021fe76a89f9556dee620220c2f75291215969338f0b838f4c70b67d9c127dd9ced2261193166 SHA512 9f144ae7efcbad71499d5431abd072a32083aa2ef98eba540bfdb0ffac3c10d13b54e705143798f609c6e6c216774d76317e8906f51ff9f655abf6b00338b9bb
-EBUILD python-3.8.18.ebuild 12377 BLAKE2B f55b29d118cdaa6a7cfabe8278737db10aa8410304c752e15080232bf3897005b1bbd67c13c3c70f52a4f4366a2f16b7b699377c01980497d6d6fc75b16131c0 SHA512 e2951d5049a9cf1498cfd3a798f2914be6498c9422b715708eeb647fdcb07594f60fc8212f1299aa9db3c09b69aff5be544a9c552734455d7c5645345de27611
-EBUILD python-3.9.18.ebuild 13860 BLAKE2B 87ab2445b4843181c44de5864a59368533774fec3a0a1593568eafbf4e7877e1b57f2e3a52196c572b75867dcf8023e6059a92f7fe5348e4ff9eb6eb7fcff5e4 SHA512 be85f7633b4d1baafe35d229576a0025526518a0bc81a154b3cf467387d7002b26e937f25c714798da329f14a22717cd0605baa8cee0ca4b663ae5c55b81a80e
+EBUILD python-3.12.1_p1.ebuild 14650 BLAKE2B 37bfa79cc6308d9d45e6f930e200d9c3eb123e46eba49e56b248312e2fa85a8a06234ce40bad1e9db6f08a3b4a1291870e105ea46f7e43791147ec11f5bc528a SHA512 d41f503fdec63fdd8d677c407dec1351ed198f0d0c37c22e926de1898cb53562bb01a2b9c00e3b5e5772150f1a410e02ee8d3fcd9e0fef220e3304d2b7ac989e
+EBUILD python-3.13.0_alpha2.ebuild 14472 BLAKE2B 6d76e348a2ef3047735e81b742398802669f05475242514751eebaf1276f3d9e0b8810fe9b4f897e197d5b21cbbbf4136c517136e8b27a02e026b61a23f79f53 SHA512 f1dc3c7f01a7dd18070cedfa820bf1ed30775aba8693b23cf4c26576ae7389eef2a77ddbe8788cb92150f778ebeb1369b4d133afb85ee4ab31d369f564bce4e8
+EBUILD python-3.8.18.ebuild 12362 BLAKE2B f7ca5a26d04d8b7209ad89e4a8dcb9f8ad19fcb40ca18608c4f0ace3d227560bb69b4fb01b012383265095118cc938ab34024b2cab658d7754612b8d4ef66338 SHA512 5fd23427706cd403094b4f5d3b537f2ba438a4c264c548b633fb59a3addf43e6c86150177de475f78fb9bb0a58be63ec26dbf291457c07f403b7c029aac7e569
+EBUILD python-3.9.18.ebuild 13845 BLAKE2B 42b2dbf7d26bda9ec75a8666e7c5e41e1b8f7eec8c82a3334536cd52aabda5790d4d4bab9c1147df1ee512a8e9bc7ae047d4b890f7570b50e515f8b32711c2bd SHA512 0502748cfb3f282da85a4617d2bb8fd9c750f8bc94b2aefbdfb1bb56c66d7a4408877ab5f334763d67937f4c19716613daf95556abc9a32a48dbf03a14ffa303
 MISC metadata.xml 1349 BLAKE2B 0e15474340a4a54c4af7b3ce4f66759cc63938470b3874a4b570dada57378e23c7f19ff3ed741c738a39872486000b3f23c7dabef32f851df089357a0b31c635 SHA512 fb3df75c0cbe308eb2f5c8096fb87533fc08fd5479905f4fd4380fd071d8a91571d40a86d8acc9313050278fa3e969960995b68b6e81a878298f64800e095362
diff --git a/dev-lang/python/python-3.10.13.ebuild b/dev-lang/python/python-3.10.13.ebuild
index be5cdcb2af4f..6645941b2590 100644
--- a/dev-lang/python/python-3.10.13.ebuild
+++ b/dev-lang/python/python-3.10.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV}_p2"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -72,7 +72,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	valgrind? ( dev-util/valgrind )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
diff --git a/dev-lang/python/python-3.11.7.ebuild b/dev-lang/python/python-3.11.7.ebuild
index 5bfd3472f572..9291c3cd5cec 100644
--- a/dev-lang/python/python-3.11.7.ebuild
+++ b/dev-lang/python/python-3.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV}_p1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -71,7 +71,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils )
 	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
diff --git a/dev-lang/python/python-3.12.1_p1.ebuild b/dev-lang/python/python-3.12.1_p1.ebuild
index 56041a87d6cc..994c674bae18 100644
--- a/dev-lang/python/python-3.12.1_p1.ebuild
+++ b/dev-lang/python/python-3.12.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV%_p*}_p2"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -72,7 +72,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? (
-		app-arch/xz-utils[extra-filters(+)]
+		app-arch/xz-utils
 		dev-python/ensurepip-pip
 		dev-python/ensurepip-setuptools
 		dev-python/ensurepip-wheel
diff --git a/dev-lang/python/python-3.13.0_alpha2.ebuild b/dev-lang/python/python-3.13.0_alpha2.ebuild
index d3d5ea4fb3de..1ee5e552ed1a 100644
--- a/dev-lang/python/python-3.13.0_alpha2.ebuild
+++ b/dev-lang/python/python-3.13.0_alpha2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_alpha/a}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV}_p1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -71,7 +71,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? (
-		app-arch/xz-utils[extra-filters(+)]
+		app-arch/xz-utils
 		dev-python/ensurepip-pip
 		dev-python/ensurepip-setuptools
 		dev-python/ensurepip-wheel
diff --git a/dev-lang/python/python-3.8.18.ebuild b/dev-lang/python/python-3.8.18.ebuild
index 80d2c90ecc14..e836c5f1262c 100644
--- a/dev-lang/python/python-3.8.18.ebuild
+++ b/dev-lang/python/python-3.8.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV}_p1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -66,7 +66,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils )
 	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
diff --git a/dev-lang/python/python-3.9.18.ebuild b/dev-lang/python/python-3.9.18.ebuild
index 9edf94c8ead2..07e9633a1397 100644
--- a/dev-lang/python/python-3.9.18.ebuild
+++ b/dev-lang/python/python-3.9.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
+PATCHSET="python-gentoo-patches-${MY_PV}_p1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -67,7 +67,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils )
 	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 4f5a1095b049..fc3b1a7ceff9 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,5 +1,7 @@
 DIST rakudo-2023.02.tar.gz 6692654 BLAKE2B 9a63e92d278235aac75fd15e2de90d2de55af2d92a650b8f0ccf61e12b41942ec47b8ecaf1f4e7bd9c55d98d09667f3ea916a79d9b3161fede264e47a3eecadc SHA512 bb631cb23e981d7bb269888d8302f95b5356a443abb93dc0ae8ca9a0e03b3da9b3ff0c03dabda405107498a36f589333001b81ebd971a0dc225f03406438f74e
 DIST rakudo-2023.10.tar.gz 6883145 BLAKE2B 158967b4af119854bc7c1fd9b95a2320727b3f2b4586ebbe30bc3ebc1c49ed412b2abcad24b30aeb54739d2944a13b9f905eadc34304b9aba024a95b2bf843ee SHA512 14368dda40c3d7340d158834b2bb3b6bf4086a3c08e7f58318e1bb47282c3f5d19ef6aaf75aa66f5b10b603b17f62e295c24f04b6d8ced80b4f9e8c593e32711
+DIST rakudo-2023.12.tar.gz 6865345 BLAKE2B 0c2404b25d5316de7ef2bf332411898fc12f154c815434ae2f8202951eba8dfbe23c278bbbaf082dcb5e4782aa0348bec10cad97ffbe2b8d55e64a987d5fe69c SHA512 fa78ea3f5eea9947eae7ab3c130956acade849fbde1b926fefdb34f0a2a74cd0a4a8b62a088a41cf207ef80d06b2e5d42048a1a2071d10d68c3e388c57d5e78e
 EBUILD rakudo-2023.02.ebuild 1598 BLAKE2B d6fa28c5a822e27dfd8e1c9194b54d533d522490e1d0f64e5f20c7e1996fa24f0b1c1a2bb3beda3a695d5b88aec5f4079bfd2dfa9b591a70dee50037c44d02bc SHA512 f68a082deaf7262a914b01ae252f722bfd3c1f4acffba31306faa333923a48cd66c31403d88ad2aa18ce29f822c275a667359c8934f53f53d20fe6c9b9d7c5af
 EBUILD rakudo-2023.10.ebuild 1598 BLAKE2B d6fa28c5a822e27dfd8e1c9194b54d533d522490e1d0f64e5f20c7e1996fa24f0b1c1a2bb3beda3a695d5b88aec5f4079bfd2dfa9b591a70dee50037c44d02bc SHA512 f68a082deaf7262a914b01ae252f722bfd3c1f4acffba31306faa333923a48cd66c31403d88ad2aa18ce29f822c275a667359c8934f53f53d20fe6c9b9d7c5af
+EBUILD rakudo-2023.12.ebuild 1598 BLAKE2B 513ea2ba61a1160bcbdd33457a499c9264e7366cae7cfef681440cfd789ea7da5815f50016bb96a275c1ecca3f9b3bec5bfb2d8acd0372ddbaa265ba33103a97 SHA512 32fb5f6ea2fd9deec33076124d51fba1b9fa6f94a4995013840faafc64691d44290087e9c4ea5507fe2fa4898f7e25e3544102fbb30ea7d3bf481b33eebad470
 MISC metadata.xml 396 BLAKE2B 43b55c331967d55e0a5c8d2dad7399c20b4104494cf3310b5a95dbef537d07908135c7f9c7829c737f64466660056de8c5656637b54079fef0f90ea4cfef5f1e SHA512 163828a65041f6d74931e32b6edf8c58ddb59151f8c68519165e81003886ce67ff4bcd21e69dc8a1fb96e4b8189fb611dcf8b9d73a52b257ccc24de516185fae
diff --git a/dev-lang/rakudo/rakudo-2023.12.ebuild b/dev-lang/rakudo/rakudo-2023.12.ebuild
new file mode 100644
index 000000000000..2af8fe10b2b6
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2023.12.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
+}
diff --git a/dev-lang/rapydscript-ng/Manifest b/dev-lang/rapydscript-ng/Manifest
index 8c92e93552ca..7e80d5a0ec15 100644
--- a/dev-lang/rapydscript-ng/Manifest
+++ b/dev-lang/rapydscript-ng/Manifest
@@ -1,5 +1,5 @@
 DIST rapydscript-ng-0.7.22.tar.gz 437745 BLAKE2B 5720a24743b0276a179a8c5da4c0f890f7c91a07968df7ac1e9c3a830d003fb4da7cfb124410428afe20cbf98429d6985750c129ab9ad01316a97d92793385ec SHA512 301d83c3a6715d2ae0e45bf344c48070273f160c3dccd3396788be360768c5df228b12f58f2eca3daea499bf6994a6cd0afc14c5cc590855d585d39753e06e00
 DIST rapydscript-ng-node_modules-0.7.22.tar.xz 2340024 BLAKE2B 7b4683ef86f639b7898d4120414844b7da15c86bcaee569be12dea29581d2aa594db713bd3ee8837bb05ffdea9f831b12302643c31eded3abaf3f88c59ac17e1 SHA512 8b26ffc4748b99a698aaa93e7a8e858b0071613596228ce880ff24889bc66171b4030dc568f0d60e52846ecb3b530c1f3adafd1fd2377ace726ee91f0a2a3c41
-EBUILD rapydscript-ng-0.7.22.ebuild 1823 BLAKE2B e914f584e265a62a4ebf5bac566d1234671973415b4d54ef8bca31fc0846bf454d75c1a1a6eb635dc3608e438c3fbfb6305972e686bfd66ddf4eee00740151a1 SHA512 74a8f4593f6e4cf266937ff83e974e715e7346ae9f3ee16f049964b2c2a10d15bad22f8f49800f826940acf6994f807c2e327eb9d5de47dd65fec812b8024636
+EBUILD rapydscript-ng-0.7.22.ebuild 1827 BLAKE2B d476524aa2f288714e8bc572bae203d1fbe1322396ab22cb54f8c5f504e316fa2254fd0a1693ab191953e7a96878a7785041526159e6827c7ff9854d2de92e53 SHA512 da1d57df888eb917ec7acb795e1842ba0384ff324ac7df6f429a370f417a2371022066486cb2f28434f982bad29148655f8427e2c675c287cd9f5cf16ad6908a
 EBUILD rapydscript-ng-9999.ebuild 1823 BLAKE2B e914f584e265a62a4ebf5bac566d1234671973415b4d54ef8bca31fc0846bf454d75c1a1a6eb635dc3608e438c3fbfb6305972e686bfd66ddf4eee00740151a1 SHA512 74a8f4593f6e4cf266937ff83e974e715e7346ae9f3ee16f049964b2c2a10d15bad22f8f49800f826940acf6994f807c2e327eb9d5de47dd65fec812b8024636
 MISC metadata.xml 487 BLAKE2B 3be2d649691d5e79745a936501c448f3ff0d703c7cd5dd5af4ed6789e91e7b06e0b477bbd0387ad95afba6e3b75bcfac6d335938c75d71dc64693dd44328e33a SHA512 e5b6c74cc7eb0f03cd53eee77507abb248f3b10f417fc6819c6c782b6c08896d6cf43ed39abb6b67155ee8935574c8718a2f68eeb3fdde8eb4266e5d5a5ffa7a
diff --git a/dev-lang/rapydscript-ng/rapydscript-ng-0.7.22.ebuild b/dev-lang/rapydscript-ng/rapydscript-ng-0.7.22.ebuild
index 75e3b3b83abe..173a518ba34d 100644
--- a/dev-lang/rapydscript-ng/rapydscript-ng-0.7.22.ebuild
+++ b/dev-lang/rapydscript-ng/rapydscript-ng-0.7.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 		https://github.com/kovidgoyal/rapydscript-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/rapydscript-ng-node_modules-${PV}.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 inherit edo
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 10553f0eaae9..06f4656d3fda 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -3,21 +3,17 @@ AUX spidermonkey-115-known-test-failures.txt 423 BLAKE2B 608afc63d49741bac0e3e5f
 AUX spidermonkey-91-known-test-failures.txt 10531 BLAKE2B 905a76f6c4b6a00dd7ffe0eff1c92c467bd48105ab612272fa5768f661fafffa3db691882674816ac38039fc74a97e2d7ca1b87b3d87966e3b35d7e6d911401f SHA512 3439eca54200c638f80f23762d358f47c43b0a9b522e72c023e158cb310d15e16f1b6c5fb95f8e4f1fdaf32cf6b3d2ca7e1d0d44fc437873ba23695de539704c
 DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b
 DIST firefox-102.15.0esr.source.tar.xz 486592324 BLAKE2B b70727fa91d0d270673374bebb4745b87f6194191c1c9415547d772811a4a85f79a97e8985877eb5c9beef43fe15bef574172da35935e7024a947919ec11d883 SHA512 87db6e32fda215253f9b3bd233ef7fa91a64349310064b8482e5c634f34cbe99a2a111d74d2b9f2a99a0b3b510dbf9039ebe4ccfc176c2554d65bc9cfb508bf9
-DIST firefox-102.6.0esr.source.tar.xz 478856656 BLAKE2B 2094bbb3ba00fc2d726a620e9946ca1ec98ad4c930ed611486ac92a7c74aa84da9c15b1353603eb36ce0a9098bd1f311dea2bea255f2bb6dd06fafbc7808d52c SHA512 c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308
-DIST firefox-102esr-patches-07j.tar.xz 23012 BLAKE2B 41b706f5ae8695ddd33e971cf1aa99317382a57618cf19163c5bca09ed5d430dba672ac51b7ab3072360452cc89ac50397bb7992882a61a3adda37022239e654 SHA512 7048353ea5504e34d9d3950e3e5e3125f631f95269d5c9e422ca052173a316718fdd4b57ea7980a452139b1192805cb598f47f398fb148a426a85a5e979c6cdd
 DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd
 DIST firefox-102esr-patches-13.tar.xz 22212 BLAKE2B 02e9edd071a99abbac02faa11ffce061d5d12d8baa9ce54b51d6bfdbf8160022a1565902d65ca30fe51b5670e509fa921b11a460989933cbb797fcd59d635125 SHA512 8b8b0f3789978447a1293fd9acb5c2db3d7e9f724357a0d762b54f7e34d28f11655997ffeafccfe8001a01dd595848d257f90cb983462c405d434cc794216520
 DIST firefox-115.3.1esr.source.tar.xz 515785920 BLAKE2B ad5ec24361e94d9185eed210f681c50159f5be3e6046d79200b5e2586107f1ed98ebe7935f1e266afadd570fc1aa6a1aec81fe3b7fb86efb48afe82514f26c68 SHA512 65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1
 DIST firefox-115esr-patches-06.tar.xz 14944 BLAKE2B e60a8a32f8c5e6d897e8c3e13d291ffab651937505ce258f031e7e75560c9eb89fce4a22c61872d639e6e1d40244e94761baa1660c2d3d02584ad4cc4778946f SHA512 d9ea1a063df287fa651042c90529b1a1b5ebd5a28735c44b5527cc7dd29678c2f8a9204f007db328371ed6af9613ca7215464c00df5e685c3af4296a22139257
 DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f2228fc4c1a8131bc2523142f2d57f32e321303581ae8f793baae48966ecb27f48bf77eb084f7b2df1c1a0c667e9ed59ae93d786e6 SHA512 201bb779e2373cc00dfadc29a62b593030dfc12eec076114b92927f29f476d3fafdd056112dd1bb1f19f82827f4fe1252141e3998bec719e4196737a316d4ef2
 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185
 DIST spidermonkey-115-patches-01.tar.xz 3992 BLAKE2B e97d0cb3edfb885119226f54f22485ed4e8220cd904d3356b87ccc013403f976a042171cf9ca7250bcf3fe3d90996dd80b4104e7d614f95d7bcfcb0e710a8a78 SHA512 cece96f172a09dd0e29f7c2fdbf650cde405b276bc4083956365289f1da4b1d078ccbde760da6553888ddb3c53cf9aded52051db556a2c4ec492fed01dcb03a1
 DIST spidermonkey-91-patches-05j.tar.xz 5964 BLAKE2B 13f09f77bf16bc61b03c9488b7ab521552e179bfb123e390d0883ea4a3f55e87e0a5d5a246f31a9ddc35f212ea84655fe9d4fc364bbdddc1aac421eb28dbe41f SHA512 4d9cf21b712234ff6a18554a010badd756028e6147597040c423f7e27d260e3984938f956d9bc3572557163a144345ed28d9f88e459fc959aaa6fd448f6deab7
 EBUILD spidermonkey-102.10.0.ebuild 11886 BLAKE2B a106d7b51434e53a5a2b81b1842fe4e5df8b2b37c29996bb540cc4dcd45e240c77951ef5e317ed16676a8b5a6b5136770f3f7e1208b1ddeb73f552b19e6f13b5 SHA512 62865742417c4d70d89d5c65b100897927f98511632e7387771342635419e244a22173ce45d2ae6348489b8e2f1e49b1fa80368a83669f6e804dc47807f857d9
 EBUILD spidermonkey-102.15.0.ebuild 15517 BLAKE2B 83b1f837413f8da7915463e5d8b6edb92be882386ab5e6ffdf9aa80a6e47a482eb6b6e2c677b00913d6d02493e3c7d6f60601eec9606bc27dd340865ff478d0f SHA512 10454da094bde8bf98ba959e3f47ee46a5a5ff53f9f09b13818afab7862352cf1de3a03ce62f2a84923fce531b594282696089f8945e3a2e79243e7cbd09a381
-EBUILD spidermonkey-102.6.0.ebuild 11283 BLAKE2B da31d238e722a0bad508850769b1cfae02e1f4303e59e6311725fee0c274f9d7a6a20ecd6e76ea347c05118a228f1486206f66b655a29b406177df26c49b93d9 SHA512 f616a8ec7b6c9d68c676a716cfc0da73f6b3e63fd657ba998c21de73cabdc5ef53913a7e13c800ba2e703adc584b29d7b9a5f640ed137c2a095ce352cd9bcf12
 EBUILD spidermonkey-115.3.1.ebuild 12934 BLAKE2B dba7bb7ee8d91ccc459b60cb883f872b81f235825b2eb25a7f956ddedd6d6dfcc0b11f22813b900b789c880be89dcc16ab1a0f8c6031b05648be6d71bd3ea683 SHA512 a092b0e731f5a1b81b7029f4bd1e8b18bb943049e68b5fdd1b0186fd0c6e5e231c00abda886095c657420306498f33f1e6cf39409b55f8de353bf8b1e108d3cc
 EBUILD spidermonkey-91.13.0-r1.ebuild 15281 BLAKE2B 889e1a07b8e9c42b55d0863c34fdae803ea391d8069e076f5957355e2a0f397bdbcb4c6b98cdf53187fae4394afb2ab636771964216df002bb6bce11a588a3d3 SHA512 b2690dc8f98fc02a6ab5ba929e96b528afd94a92101cb1982f3170da25886f3d52064e94804890c3595ceca46b54b086e678ed59a8195a5c53406e23fdbb2ccb
 MISC metadata.xml 513 BLAKE2B 58ffd474492f03c16bda95e48511fb6281e03067d2ad77e994f8117345ecece5da9591dccedafe75b037d98e06851a3759caa4b993adc2910dbb76e1c01a7fa3 SHA512 1ee02bff37e2dabbd72b7f719463b12299270c7960b4cf5a92afab17c954c50e6acb826d4a91db4954fb4a7b0f8669988f2cdb5be991df90e3a605c6b35fdbfb
diff --git a/dev-lang/spidermonkey/spidermonkey-102.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.6.0.ebuild
deleted file mode 100644
index f660969d8614..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-102.6.0.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-# Patch version
-FIREFOX_PATCHSET="firefox-102esr-patches-07j.tar.xz"
-SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-04j.tar.xz"
-
-LLVM_MAX_SLOT=15
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ssl,xml(+)"
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="firefox"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
-
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
-
-SLOT="$(ver_cut 1)"
-LICENSE="MPL-2.0"
-IUSE="clang cpu_flags_arm_neon debug +jit lto test"
-
-#RESTRICT="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/llvm:15
-			clang? (
-				sys-devel/clang:15
-				virtual/rust:0/llvm-15
-				lto? ( sys-devel/lld:15 )
-			)
-		)
-		(
-			sys-devel/llvm:14
-			clang? (
-				sys-devel/clang:14
-				virtual/rust:0/llvm-14
-				lto? ( sys-devel/lld:14 )
-			)
-		)
-	)
-	!clang? ( virtual/rust )
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
-	)"
-DEPEND=">=dev-libs/icu-71.1:=
-	dev-libs/nspr
-	sys-libs/readline:0=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
-		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use lto ; then
-			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
-				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-python_check_deps() {
-	if use test ; then
-		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_pretend() {
-	if use test ; then
-		CHECKREQS_DISK_BUILD="7000M"
-	else
-		CHECKREQS_DISK_BUILD="6000M"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use test ; then
-			CHECKREQS_DISK_BUILD="7000M"
-		else
-			CHECKREQS_DISK_BUILD="6000M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_prepare() {
-	pushd ../.. &>/dev/null || die
-
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-
-	eapply "${WORKDIR}"/firefox-patches
-	eapply "${WORKDIR}"/spidermonkey-patches
-
-	default
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	# use prefix shell in wrapper linker scripts, bug #789660
-	hprefixify "${S}"/../../build/cargo-{,host-}linker
-
-	einfo "Removing pre-built binaries ..."
-	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	MOZJS_BUILDDIR="${WORKDIR}/build"
-	mkdir "${MOZJS_BUILDDIR}" || die
-
-	popd &>/dev/null || die
-	eautoconf
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current CFLAGS:    ${CFLAGS}"
-	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Current LDFLAGS:   ${LDFLAGS}"
-	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
-
-	local have_switched_compiler=
-	if use clang; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		if tc-is-gcc; then
-			have_switched_compiler=yes
-		fi
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	export AS="$(tc-getCC) -c"
-	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
-
-	cd "${MOZJS_BUILDDIR}" || die
-
-	# ../python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	local -a myeconfargs=(
-		--host="${CBUILD:-${CHOST}}"
-		--target="${CHOST}"
-
-		--disable-ctype
-		--disable-jemalloc
-		--disable-optimize
-		--disable-smoosh
-		--disable-strip
-
-		--enable-readline
-		--enable-release
-		--enable-shared-js
-
-		--with-intl-api
-		--with-system-icu
-		--with-system-nspr
-		--with-system-zlib
-		--with-toolchain-prefix="${CHOST}-"
-
-		$(use_enable debug)
-		$(use_enable jit)
-		$(use_enable test tests)
-	)
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		myeconfargs+=( --enable-rust-simd )
-	fi
-
-	# Modifications to better support ARM, bug 717344
-	if use cpu_flags_arm_neon ; then
-		myeconfargs+=( --with-fpu=neon )
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			myeconfargs+=( --with-thumb=yes )
-			myeconfargs+=( --with-thumb-interwork=no )
-		fi
-	fi
-
-	# Tell build system that we want to use LTO
-	if use lto ; then
-		if use clang ; then
-			myeconfargs+=( --enable-linker=lld )
-			myeconfargs+=( --enable-lto=cross )
-		else
-			myeconfargs+=( --enable-linker=bfd )
-			myeconfargs+=( --enable-lto=full )
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-lto
-
-	if tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Use system's Python environment
-	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	# Show flags we will use
-	einfo "Build CFLAGS:    ${CFLAGS}"
-	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Build LDFLAGS:   ${LDFLAGS}"
-	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
-
-	# Forcing system-icu allows us to skip patching bundled ICU for PPC
-	# and other minor arches
-	ECONF_SOURCE="${S}" \
-		econf \
-		${myeconfargs[@]} \
-		XARGS="${EPREFIX}/usr/bin/xargs"
-}
-
-src_compile() {
-	cd "${MOZJS_BUILDDIR}" || die
-	default
-}
-
-src_test() {
-	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
-		einfo "Smoke-test successful, continuing with full test suite"
-	else
-		die "Smoke-test failed: did interpreter initialization fail?"
-	fi
-
-	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_failures.list || die
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "non262/extensions/clone-errors.js" >> "${T}"/known_failures.list
-		echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> "${T}"/known_failures.list
-		echo "test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js" >> "${T}"/known_failures.list
-	fi
-
-	${EPYTHON} \
-		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
-		--exclude-file="${T}"/known_failures.list \
-		"${MOZJS_BUILDDIR}"/js/src/js \
-		|| die
-
-	if use jit ; then
-		${EPYTHON} \
-			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
-			--exclude-file="${T}"/known_failures.list \
-			"${MOZJS_BUILDDIR}"/js/src/js basic \
-			|| die
-	fi
-}
-
-src_install() {
-	cd "${MOZJS_BUILDDIR}" || die
-	default
-
-	# fix soname links
-	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
-	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
-	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
-	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
-	popd &>/dev/null || die
-
-	# remove unneeded files
-	rm \
-		"${ED}"/usr/bin/js${MY_MAJOR}-config \
-		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
-		|| die
-
-	# fix permissions
-	chmod -x \
-		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
-		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
-		|| die
-}