7 files changed, 110 insertions, 266 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b856bfb6eee4..db36376a620d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index deb8f2c7d9dc..f92ad9a10eca 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,9 +1,11 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
+DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
 DIST nim-1.6.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646
 DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
 DIST nim-1.6.8.tar.xz 5219880 BLAKE2B 16eac6f302b4ef1df14deaa0350e0e5553c7613515cc3e79cbe025af70955bef29c8261a1f91ba901023d9c53f9f00d62116301eb5a4ee4bb5314bb1e25a5755 SHA512 dd046dd393136fdcb78f463e267756bdb990b08e80e3a8be7fec1995b47a930447468e12bb9a59db6ec5546117f62ff4ccd032959879ef2d1d06a7bc5c438f83
 DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
+EBUILD nim-1.6.10.ebuild 2567 BLAKE2B e12db79387175ec7021f1a4410a9479a103ec7996ca4dc4af712c706a6848da0ed868a2a94307dfe532bff0b6a24eb85e5c970e1948f19023fa5a1b421cb8f87 SHA512 bb6075b7aa4b8dae2420546a1f857ecb0bd9da16cfbe1b4a31cc5bf2eefb0e9abbbe8d3df31d96cb48b95587f839cf96f56b4f5d94bca8818fd6314d38eaf7c0
 EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
 EBUILD nim-1.6.6-r2.ebuild 2565 BLAKE2B bc888ebb22d8932fb905088d2f8042e0bde6e0e1ff495967d130f3477e6494c392f04b17dea7c49b35eac3c56d5534427e9384b92a365f0539a5c63a452d7bb3 SHA512 6e116b206c24927c30513ee97cd9035952380b1b88bb240ffc8909a1989d0fbba9827685fd4ab759e02077422afdd0cad28028980ffd7ebfef47d11d3c163b16
 EBUILD nim-1.6.8.ebuild 2567 BLAKE2B e12db79387175ec7021f1a4410a9479a103ec7996ca4dc4af712c706a6848da0ed868a2a94307dfe532bff0b6a24eb85e5c970e1948f19023fa5a1b421cb8f87 SHA512 bb6075b7aa4b8dae2420546a1f857ecb0bd9da16cfbe1b4a31cc5bf2eefb0e9abbbe8d3df31d96cb48b95587f839cf96f56b4f5d94bca8818fd6314d38eaf7c0
diff --git a/dev-lang/nim/nim-1.6.10.ebuild b/dev-lang/nim/nim-1.6.10.ebuild
new file mode 100644
index 000000000000..00b90b784ff9
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.10.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="
+	https://nim-lang.org/download/${P}.tar.xz
+	experimental? (
+		https://git.sr.ht/~cyber/${PN}-patches/archive/1.6.6.tar.gz
+			-> ${PN}-patches-1.6.6.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug experimental"
+RESTRICT="test"  # need to sort out depends and numerous failures
+
+# BDEPEND="sys-process/parallel"
+# BDEPEND="test? ( net-libs/nodejs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
+
+# Borrowed from nim-utils.eclass (guru overlay).
+nim_gen_config() {
+	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
+	cc:"gcc"
+	gcc.exe:"$(tc-getCC)"
+	gcc.linkerexe:"$(tc-getCC)"
+	gcc.cpp.exe:"$(tc-getCXX)"
+	gcc.cpp.linkerexe:"$(tc-getCXX)"
+	gcc.options.speed:"${CFLAGS}"
+	gcc.options.size:"${CFLAGS}"
+	gcc.options.debug:"${CFLAGS}"
+	gcc.options.always:"${CPPFLAGS}"
+	gcc.options.linker:"${LDFLAGS}"
+	gcc.cpp.options.speed:"${CXXFLAGS}"
+	gcc.cpp.options.size:"${CXXFLAGS}"
+	gcc.cpp.options.debug:"${CXXFLAGS}"
+	gcc.cpp.options.always:"${CPPFLAGS}"
+	gcc.cpp.options.linker:"${LDFLAGS}"
+
+	$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+	-d:"$(usex debug debug release)"
+	--parallelBuild:"$(makeopts_jobs)"
+	EOF
+}
+
+src_prepare() {
+	default
+
+	# note: there are consumers in the ::guru overlay
+	use experimental && eapply "${WORKDIR}"/${PN}-patches-1.6.6
+}
+
+src_configure() {
+	xdg_environment_reset  # bug 667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	nim_gen_config
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	# Build from C sources
+	# Compiling with sys-process/parallel fails for some reason but hopefully
+	# we'll be able to enable it later...
+	edo bash build.sh  # --parallel "$(makeopts_jobs)"
+
+	edo ./bin/nim compile koch
+	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
+	edo ./koch tools
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch test
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
+
+	# "./koch install" installs only "nim" binary
+	# but not the rest
+	exeinto /usr/bin
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		doexe "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 97bd28135874..8083f37d3777 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,4 @@
 AUX spidermonkey-102-known-test-failures.txt 6587 BLAKE2B 32f10b97eddfc85a6ad21412c4ffbe8c38957410e9e9297d5dbbefdc290bdf23481cf423084202568a47b5328a223f0bc2db204dd13989058ba44f0428704594 SHA512 c0f6c9569d89b68517545439c704fcf2379bd396b4a6f4486a730b7c0bad1044aa5f2c650dcb823ff823c3ff47efa1d2c4c48594dcb5b4a4ba8b9edbd24aecc6
-AUX spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch 2554 BLAKE2B d5759da22c521e389b8633aa2aa75e0a300af76f431a53c0bd445781002b0b7dd93543657cdf53afb12d87e4be1464584d5c3ccb30a2c9acc608aaeb1b2eb34f SHA512 d767cb00988772a0e5789d5b27aaaf0c0cc0124f4dd78ba67d2c4b4587c26346b01fc5b3d29f346e931dcd037ecefc8cec0d5c48510726a1841a6b6396c5507c
-AUX spidermonkey-60.5.2-ia64-support.patch 1615 BLAKE2B bd2ae36194bdb6a17638ec500e5211abb9700f2b7c5056b5be51e8e54d59326a5c9f0cb6d2d6fa56dd946dba264635e6d75e9b4ed52103c7904df19d33257c7d SHA512 71f2a0f27910ae086910f6599985a32ad2fdedeffc9c4c6baa446f4856dee74051fa158cc0552a3f21210098e0d006a0b5d781437fded80969e1edf23c04b9e0
 AUX spidermonkey-68.0-add-riscv-support.patch 4328 BLAKE2B 64ef005bff60ce3cc3e698a65494ef97441b9f27493bcbc7576286f6e06ce754dbcbcc8d9088ca88f6aa1a1ea7f008565922b5a4baf54019c64d8040c5b509f1 SHA512 70aad64600221f805f0fcd485b63c5383e9f160889b001963f5b6196d57672257c8ce02e75ad384bd2a0eeb9eeae0f7fc4820f1abcec3677f736cd60391f7d6f
 AUX spidermonkey-68.0-loong-support.patch 4156 BLAKE2B ed86f74240c1c7df0ae5012e80d3c4daec1083cdb48d3a985bdc4be287e591e536195ecc38a30f42bfa8d39ba3f46f2bef235ea2691687f7f33ba5f6052438b9 SHA512 0b8554b7afd35738ce9e2d2c71ea6658a680523160f5b05a7734ebdaccd6cdd288aa3168fd0a97318da88b2f149e6a4662b6069da1e805564b5320f674438e66
 AUX spidermonkey-91-known-test-failures.txt 8778 BLAKE2B e429909a6aa90dc6127ba957045d119d894f50fed508ee5ef47bdd163585987510c5cc0898f0d8af608a7ec3f8425a3b8d1073b6cfc1fda5196a81a1c255d885 SHA512 b2cb12abd942ecdfca641dcc63ac652574fbb010b78e4661c29e669d3beb2217f60904d61d5a574cf8d70040c2290672fbb410234f78f665b6bb63fefa0090ed
@@ -14,15 +12,12 @@ DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a
 DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
 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 mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
 DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f2228fc4c1a8131bc2523142f2d57f32e321303581ae8f793baae48966ecb27f48bf77eb084f7b2df1c1a0c667e9ed59ae93d786e6 SHA512 201bb779e2373cc00dfadc29a62b593030dfc12eec076114b92927f29f476d3fafdd056112dd1bb1f19f82827f4fe1252141e3998bec719e4196737a316d4ef2
-DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
 EBUILD spidermonkey-102.4.0.ebuild 11064 BLAKE2B 4477456fc5958dbdbf5935762a0fcd1c295f888b0770a6fa0cf6b2bbdd693acb30d6c5652157b1a20541a37e7a6db8487fe5e6b818d0b5784decf1d11672fa7b SHA512 8b66e29fb142a2a9c534217492bb9f607c1127a69b10389b44d1391363eefd0772b65c2c869d3dbb553b8b63a5527010d8a195e6ffe06bc5efd79994e240abf6
 EBUILD spidermonkey-102.5.0.ebuild 11299 BLAKE2B 9a1d889e73450c1947323448b73d39854c7957e47c7f7031a12ceec5874d24180dbed9e757439477366d3a766a8a0298f88a18c4843b13c86bb3482e913bc604 SHA512 612fd5d0d8194754cf05d2d9c4c3afd3e64709c713f3124a9f89b814ed96493f28ea64cd73579790372915a0128d93ec62c057fec99d7ac16bc5e3996031b737
-EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13130 BLAKE2B d0c2f2749c442b6d67ad990e07e2496ef1c57af7e71f0fd0d7fc362d11278e062847d730429b64edfc94e289c11236efdc3b66006fd6c7208bedf3043f6676ca SHA512 626aa7d0d21e5718def7d2e948c2606ae07a0536267ec6c81af2f95bc390e0eb2c436d4749fe65ccb8d1efac311525ac69261f27754bfb2a039e9fb73935aa7d
 EBUILD spidermonkey-91.11.0.ebuild 15080 BLAKE2B 0f68ed8232a2f7b34a6be94638a24c8f0a039e285f84945f5655357b6374341251651aad3a98ca05909dfe40eceff3b62e80a088baf8a78e72d89fa5b4769981 SHA512 5fa0fde2e74255e34c00869f06780cc7ed8cc251c41a35e9f9c7e2330282e7b487039c3a1b100dead979ce06d0b2254bd1c63c8e6e1f83d7dbcddabb8f442834
diff --git a/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch b/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch
deleted file mode 100644
index 8b2245f1e353..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-fix-virtual-address-length.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8099213b51180254b322332ecd573239da4212c4 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 23 Jan 2020 22:57:53 +0000
-Subject: [PATCH] ProcessExecutableMemory.cpp: fix virtual address length on
- ia64
-
-ia64's usable virtual address space is page dependent. For 16K
-pages with 3 levels of page tables de can address only 44 bits
-of virtual memory, not default 47.
-
-The change makes page size detection dynamic and adapts to
-addressable bits. On ia64 it is '4 * log2(page_size/8)'.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- js/src/jit/ProcessExecutableMemory.cpp | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/js/src/jit/ProcessExecutableMemory.cpp b/js/src/jit/ProcessExecutableMemory.cpp
-index 9e55c262..8581c150 100644
---- a/js/src/jit/ProcessExecutableMemory.cpp
-+++ b/js/src/jit/ProcessExecutableMemory.cpp
-
-@@ -248,7 +248,32 @@ static void* ComputeRandomAllocationAddress() {
-   // x64 CPUs have a 48-bit address space and on some platforms the OS will
-   // give us access to 47 bits, so to be safe we right shift by 18 to leave
-   // 46 bits.
-+# ifdef __ia64__
-+  // On ia64 virtual address space looks like one of:
-+  //   virt_addr_64 = [ <63..61> | <unimplemented> | L3 | L2 | L1 | offset ]
-+  //   virt_addr_64 = [ <63..61> | <unimplemented> | L4 | L3 | L2 | L1 | offset ]
-+  // where L{1..L4} are page tables. Each page table (except top-level L3 or L4)
-+  // is itself a page-size entry and can store PageSize / 8 entries. Top-level
-+  // entry is 1/8 of of L1/L2 (as 3 upper bits are part of <63..61> address part).
-+  // Note: that makes addressable size directly depend on page size.
-+  //
-+  // We conservatively assume 3 levels of page tables here. This makes the
-+  // following formula:
-+  //   L3     = log2(PAGE / 8 / 8) = log2(PAGE / 8) - 3
-+  //   L2                          = log2(PAGE / 8)
-+  //   L1                          = log2(PAGE / 8)
-+  //   offset = log2(PAGE)         = log2(PAGE / 8) + 3
-+  // thus
-+  //  L3 + L2 + L1 + offset = 4 * log2(PAGE / 8)
-+  // For more details see http://www.ia64-linux.org/doc/IA64linuxkernel.PDF
-+  // (slide 19: "user regions").
-+  static uint64_t ia64_virt_bits = std::min<uint64_t>(
-+      4 * (mozilla::FloorLog2(gc::SystemPageSize() / 8)),
-+      46);
-+  rand >>= (64 - ia64_virt_bits);
-+# else
-   rand >>= 18;
-+# endif
- #else
-   // On 32-bit, right shift by 34 to leave 30 bits, range [0, 1GiB). Then add
-   // 512MiB to get range [512MiB, 1.5GiB), or [0x20000000, 0x60000000). This
--- 
-2.25.0
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-support.patch b/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-support.patch
deleted file mode 100644
index 90c8a4c9da3b..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-60.5.2-ia64-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 35d787c782a075c0a01e29605d254950fd1e81a6 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 25 Jul 2019 10:17:39 -0500
-Subject: [PATCH] Add support for ia64 atomic-ops
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- js/src/jit/AtomicOperations.h                    | 2 ++
- js/src/jit/none/AtomicOperations-feeling-lucky.h | 6 ++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h
-index 3501e65b..44c3f358 100644
---- a/js/src/jit/AtomicOperations.h
-+++ b/js/src/jit/AtomicOperations.h
-@@ -393,6 +393,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) {
- #include "jit/none/AtomicOperations-feeling-lucky.h"
- #elif defined(__s390__) || defined(__s390x__)
- #include "jit/none/AtomicOperations-feeling-lucky.h"
-+#elif defined(__ia64__)
-+#include "jit/none/AtomicOperations-feeling-lucky.h"
- #else
- #error "No AtomicOperations support provided for this platform"
- #endif
-diff --git a/js/src/jit/none/AtomicOperations-feeling-lucky.h b/js/src/jit/none/AtomicOperations-feeling-lucky.h
-index c0b43699..a3f4497e 100644
---- a/js/src/jit/none/AtomicOperations-feeling-lucky.h
-+++ b/js/src/jit/none/AtomicOperations-feeling-lucky.h
-@@ -80,6 +80,12 @@
- #define GNUC_COMPATIBLE
- #endif
- 
-+#ifdef __ia64__
-+#define HAS_64BIT_ATOMICS
-+#define HAS_64BIT_LOCKFREE
-+#define GNUC_COMPATIBLE
-+#endif
-+
- // The default implementation tactic for gcc/clang is to use the newer
- // __atomic intrinsics added for use in C++11 <atomic>.  Where that
- // isn't available, we use GCC's older __sync functions instead.
--- 
-2.22.0
-
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
deleted file mode 100644
index ef5e64bc7a31..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 flag-o-matic
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_rc/.rc}"
-MY_P="${MY_P/_pre/pre}"
-MY_P="${MY_P%_p[0-9]*}"
-DESCRIPTION="Stand-alone JavaScript C++ library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-#SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre3/${MY_P}.tar.bz2
-SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PN}-60.0-patches-04.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="60"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug +jit minimal +system-icu test"
-
-# Disable tests:
-# Version is dead and most issues are related to the use of
-# system's ICU.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-
-BUILDDIR="${S}/jsobj"
-
-RDEPEND=">=dev-libs/nspr-4.13.1
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	>=sys-libs/zlib-1.2.3:=
-	system-icu? ( >=dev-libs/icu-59.1:= )"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="2G"
-
-	check-reqs_pkg_setup
-}
-pkg_setup() {
-	[[ ${MERGE_TYPE} == "binary" ]] || \
-		moz_pkgsetup
-	export SHELL="${EPREFIX}/bin/bash"
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/${PN}"
-	eapply "${FILESDIR}/${PN}-60.5.2-ia64-support.patch"
-	eapply "${FILESDIR}/${PN}-60.5.2-ia64-fix-virtual-address-length.patch"
-
-	eapply_user
-
-	append-atomic-flags # bug 688574
-
-	cd "${S}/js/src" || die
-	eautoconf old-configure.in
-	eautoconf
-
-	# remove options that are not correct from js-config
-	sed '/lib-filenames/d' -i "${S}"/js/src/build/js-config.in || die "failed to remove invalid option from js-config"
-
-	# there is a default config.cache that messes everything up
-	rm -f "${S}/js/src"/config.cache || die
-
-	mkdir -p "${BUILDDIR}" || die
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	tc-export AR RANLIB
-
-	ECONF_SOURCE="${S}/js/src" \
-	econf \
-		--disable-jemalloc \
-		--enable-readline \
-		--with-system-nspr \
-		--with-system-zlib \
-		--disable-optimize \
-		--with-intl-api \
-		--with-toolchain-prefix="${CHOST}-" \
-		$(use_with system-icu) \
-		$(use_enable debug) \
-		$(use_enable jit ion) \
-		$(use_enable test tests) \
-		XARGS="/usr/bin/xargs" \
-		CONFIG_SHELL="${EPREFIX}/bin/bash" \
-		CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}"
-}
-
-cross_make() {
-	emake \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CXX="${BUILD_CXX}" \
-		RANLIB="${BUILD_RANLIB}" \
-		"$@"
-}
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
-		cross_make \
-			MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
-			HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
-			MOZ_PGO_OPTIMIZE_FLAGS="" \
-			host_jsoplengen host_jskwgen
-		cross_make \
-			MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \
-			-C config nsinstall
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -i \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			Makefile || die
-		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake \
-		MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
-		HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
-		MOZ_PGO_OPTIMIZE_FLAGS=""
-}
-
-src_test() {
-	cd "${BUILDDIR}/js/src/jsapi-tests" || die
-	./jsapi-tests || die
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-
-	if ! use minimal; then
-		if use jit; then
-			pax-mark m "${ED}"usr/bin/js${SLOT}
-		fi
-	else
-		rm -f "${ED}"usr/bin/js${SLOT}
-	fi
-
-	# We can't actually disable building of static libraries
-	# They're used by the tests and in a few other places
-	find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die
-}