commit:     5c80805d1c03aa9c499ba1f44f2a01964ce67180
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 11:37:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 13:12:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c80805d

dev-lang/spidermonkey: drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15454
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-lang/spidermonkey/Manifest                     |  16 --
 .../files/moz38-dont-hardcode-libc-soname.patch    |  15 --
 .../files/spidermonkey-1.8.5-LTO.patch             |  58 ------
 .../spidermonkey-52.0-fix-alpha-bitness.patch      |  32 ---
 .../files/spidermonkey-52.0-gcc9-overflow.patch    |  24 ---
 .../spidermonkey-perl-defined-array-check.patch    |  11 -
 dev-lang/spidermonkey/metadata.xml                 |   1 -
 dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild |  53 -----
 dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild | 153 --------------
 dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild | 148 -------------
 .../spidermonkey/spidermonkey-17.0.0-r5.ebuild     | 142 -------------
 dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild   | 147 -------------
 dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild   | 148 -------------
 .../spidermonkey-52.9.1_pre1-r1.ebuild             | 157 --------------
 .../spidermonkey/spidermonkey-52.9.1_pre1.ebuild   | 154 --------------
 .../spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild  | 151 --------------
 .../spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild  | 154 --------------
 dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild  | 226 --------------------
 dev-lang/spidermonkey/spidermonkey-68.11.0.ebuild  | 232 ---------------------
 dev-lang/spidermonkey/spidermonkey-68.7.0.ebuild   | 222 --------------------
 dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild   | 222 --------------------
 dev-lang/spidermonkey/spidermonkey-68.9.0.ebuild   | 222 --------------------
 profiles/arch/ia64/package.use.mask                |   1 -
 23 files changed, 2689 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 154013425ec..522629cc33d 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,28 +1,12 @@
-DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B 
bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2
 SHA512 
8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
-DIST firefox-68.0-patches-14.tar.xz 17488 BLAKE2B 
697aecf97b04b45ea17ed1c1eaded95ca5064760cd0468968326f1683c10d91b76458c0f3e1ae7772b0d43c33632c03a69e5b09579284de19ecaaf7603dc2412
 SHA512 
9a601b80f747eb52ce772ec931d4f5ff0180ca1531c92d46ca116fb8218c829b9be496392e785d79106c76abef149e666cdc65204bdf1ebb7904b65264cfa6b6
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B 
f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7
 SHA512 
9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
-DIST firefox-68.10.0esr.source.tar.xz 314526224 BLAKE2B 
698367314caa4d8e9fd64e5ec6fd26316a26470f94d095dd212932cb968ecabd492563d661df46be693c8deb16cdb45c6ba756d506a8211f184e4637c7d9e986
 SHA512 
c5c1833560364851e7cf8ea51659bc4fb60239b960125cdb20fe31f742d757ffdaef8f314f800dc91214ee8e358033dc2af971c08bbba474ef6158b101881653
-DIST firefox-68.11.0esr.source.tar.xz 321294384 BLAKE2B 
ee44ed20584f5b1e3c41de62a720c6e91784d76503198d8363ce6d6f74454ce101c9b811d8295b81eb6454bdb20e1109c3e9c5cd052e0e9a6f7607d338a97783
 SHA512 
7dcfa4944945bce184b96643a7afbd0cc97c93e4f727695bd5ee1e1745cff89784e68baf109588ef56791211b4b8f5c7c056ae6ac77f54fd00a5af5d5606f23e
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B 
eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c
 SHA512 
839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
-DIST firefox-68.7.0esr.source.tar.xz 312235932 BLAKE2B 
17030bc74341ecae74d7dadcb0fc0212e61e3f01463671e57f73c90e534db1088d597d43bc362cd083ca26b056bce45684eda121b2cd91c7793c44a7c40efb7a
 SHA512 
a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593
-DIST firefox-68.8.0esr.source.tar.xz 312602308 BLAKE2B 
19be922cdadc705a267f35450e742cf9cf2f793a3e74dd9a397f898ff879cf9d7e59ccc148a9fa47f3c637c30887c205f01069e689f0586fb9ef82f4e6b160ce
 SHA512 
139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3
-DIST firefox-68.9.0esr.source.tar.xz 317469120 BLAKE2B 
f04f8ca1abe802edb6d37c0de5f8024d513331fd80c9b701c93de74cbafc0650b1c0f58e54a2dbe6bee0457698dc386093aab7749c9b0738bf146bfbae6bf4e2
 SHA512 
98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8
 DIST firefox-78.2.0esr.source.tar.xz 331996944 BLAKE2B 
bd16877d078de66a418ae114c534b26313f112b9e40ad5cf112fb07a4d7335dc47071ee6e959e3e4c179b95afbdc5ab9cda7cdefa96355dbbaf6b75c7805d171
 SHA512 
38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b
 DIST firefox-esr-78-patches-01.tar.xz 30808 BLAKE2B 
c3005a04233462c800ff0da7ba5e4f1e4d350c21e2642a93aa48637fcc19b8c0e97222669629a152ad6403652f83d4fdf3191b3c2741dca5327b101ef491d962
 SHA512 
7b2aba8dd4ff2f8ac3236ae95eec73aff3560e8f11f170f09b28ae2c7681dc0220ac63724a331dcc792c86e73145acee173a19bce5fcf995ba40ed5d067e1eff
-DIST js-1.7.0.tar.gz 1165607 BLAKE2B 
61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c
 SHA512 
9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 
76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be
 SHA512 
2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
-DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 
42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4
 SHA512 
debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
-DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 
89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a
 SHA512 
84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 
0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf
 SHA512 
187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 
45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45
 SHA512 
5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
-DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B 
a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a
 SHA512 
39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4
-DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 
8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f44446a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192
 SHA512 
88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3
 DIST spidermonkey-52.0-patches-1.tar.xz 3112 BLAKE2B 
d8f4c44cb2ae290fa51efc4725a2c1b3cd85dd9f04f4ccfa5681ba6df5f37f5d8d4ad6859316a70d0f7647ac2cee014d126f88b7d4ca74a82796f35b141200ef
 SHA512 
5328403e3b9ecd1c456037e7cca374c2453d9331752c48b9466e498e22fd8d4ca6e1804e51140ee0be027fcef7d0c3f26822b1f569305a3b2f03209b7fb15499
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B 
af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e
 SHA512 
fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-03.tar.xz 4744 BLAKE2B 
2a323ea9b6291e427631f986822e779cd3d302b617a827ff020760bb1b19cacbc588d5c76637e386f62b8b64036b0b665bfecae7fdb08477fa5d7fb13630523c
 SHA512 
1465331b61abc9c14245bc6510f1f6996274795853d12d209d7e0a088b37a1a2488cc5cc61a6c2bd0fe05971dad54b19614fb477ec3176b240aa6e0190e89b47
 DIST spidermonkey-78-patches-01.tar.xz 2100 BLAKE2B 
5001c30c395c3ad4f77eb2c3f542f5547184b9c7493988b9433a175853983020b4c450efb674ea94e2575be50f9aff36d0e1418777327b7c806c52e37e8be556
 SHA512 
d31a037ebdda4a1b9d9a53881f5e5d3d547349b3fe4a0dbcf1c1cd27ff8076ee71186f080358fde586af8305cc82283c5fa67f4101637272078d057100a24065
-DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 
4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7
 SHA512 
6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B 
fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1
 SHA512 
cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
-DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B 
a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea
 SHA512 
21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f
-DIST spidermonkey-slot38-patches-01.tar.xz 7472 BLAKE2B 
7585aa6f5a84d6ae21e41137fca8da093580182f798f63bfcf2e402e3bf58df4cb3f43cef3eb635044508800f6757247fa3a65ca53230243a455925f436a9510
 SHA512 
953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09
-DIST spidermonkey-slot45-patches-01.tar.xz 5092 BLAKE2B 
0188a179fc741ab84a93aae1e77f8b765868ca716b8879661bfa678aef918998c9488db3b866a13c79ae28edb43ac0ebb10345b0471b717c4174c61cba9646bc
 SHA512 
d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a

diff --git a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch 
b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
deleted file mode 100644
index 708c7496975..00000000000
--- a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py       2018-01-12 
12:21:16.764318254 -0500
-+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py       2018-01-12 
12:22:23.392069398 -0500
-@@ -93,10 +93,11 @@
- 
- if info['os'] == 'linux':
-     import ctypes
-+    import ctypes.util
-     import errno
-     PR_SET_SECCOMP = 22
-     SECCOMP_MODE_FILTER = 2
--    ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, 
SECCOMP_MODE_FILTER, 0)
-+    ctypes.CDLL(ctypes.util.find_library('c'), 
use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
-     info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
- else:
-     info['has_sandbox'] = True

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch 
b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
deleted file mode 100644
index 7c36b5525b0..00000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6ff7ad09daf98e5b804cf73c066c382a76e74e8c Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.mil...@gmx.de>
-Date: Wed, 12 Jun 2019 00:29:23 -0500
-Subject: [PATCH] Fix breakage with lto builds
-
-<artificial>:(.text+0x7a): undefined reference to `PopActiveVMFrame'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Alexander Miller <alex.mil...@gmx.de>
----
- js/src/methodjit/InvokeHelpers.cpp | 2 +-
- js/src/methodjit/MethodJIT.cpp     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/methodjit/InvokeHelpers.cpp 
b/js/src/methodjit/InvokeHelpers.cpp
-index d017c2a..abde396 100644
---- a/js/src/methodjit/InvokeHelpers.cpp
-+++ b/js/src/methodjit/InvokeHelpers.cpp
-@@ -500,7 +500,7 @@ stubs::PutActivationObjects(VMFrame &f)
-     js::PutActivationObjects(f.cx, f.fp());
- }
- 
--extern "C" void *
-+extern "C" void * __attribute__((used))
- js_InternalThrow(VMFrame &f)
- {
-     JSContext *cx = f.cx;
-diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
-index 4feefbc..66099e6 100644
---- a/js/src/methodjit/MethodJIT.cpp
-+++ b/js/src/methodjit/MethodJIT.cpp
-@@ -120,20 +120,20 @@ static uint32 StubCallsForOp[STUB_CALLS_FOR_OP_COUNT];
- 
- extern "C" void JaegerTrampolineReturn();
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PushActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f);
-     f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, 
JaegerTrampolineReturn));
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- PopActiveVMFrame(VMFrame &f)
- {
-     f.entryfp->script()->compartment->jaegerCompartment->popActiveFrame();
- }
- 
--extern "C" void JS_FASTCALL
-+extern "C" void JS_FASTCALL __attribute__((used))
- SetVMFrameRegs(VMFrame &f)
- {
-     f.cx->setCurrentRegs(&f.regs);
--- 
-2.22.0
-

diff --git 
a/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch 
b/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch
deleted file mode 100644
index b0f87296438..00000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
-# Date 1482966103 -3600
-# Node ID 1f4d99d8dff27bcc25eff21dc6a16dae63f48595
-# Parent  ce9e9f0dc752896ac7ba00bb0610b3f731e948b0
-Bug 1326496 - mozbuild: Fix bitness from 32 to 64 bits on alpha. r=glandium
-
-
-diff --git a/python/mozbuild/mozbuild/configure/constants.py 
b/python/mozbuild/mozbuild/configure/constants.py
---- a/python/mozbuild/mozbuild/configure/constants.py
-+++ b/python/mozbuild/mozbuild/configure/constants.py
-@@ -35,17 +35,17 @@ Kernel = EnumString.subclass(
-     'Linux',
-     'NetBSD',
-     'OpenBSD',
-     'WINNT',
- )
- 
- CPU_bitness = {
-     'aarch64': 64,
--    'Alpha': 32,
-+    'Alpha': 64,
-     'arm': 32,
-     'hppa': 32,
-     'ia64': 64,
-     'mips32': 32,
-     'mips64': 64,
-     'ppc': 32,
-     'ppc64': 64,
-     's390': 32,
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-52.0-gcc9-overflow.patch 
b/dev-lang/spidermonkey/files/spidermonkey-52.0-gcc9-overflow.patch
deleted file mode 100644
index c7eb0f62b28..00000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-52.0-gcc9-overflow.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 311fc467219ab6ee9eed60759b58a8066c4bf36d Mon Sep 17 00:00:00 2001
-From: 
-Date: Thu, 25 Jul 2019 10:00:33 -0500
-Subject: [PATCH] gcc-9 overflow fix
-
----
- js/src/jsapi-tests/testPrintf.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/js/src/jsapi-tests/testPrintf.cpp 
b/js/src/jsapi-tests/testPrintf.cpp
-index 51486856..03cc118d 100644
---- a/js/src/jsapi-tests/testPrintf.cpp
-+++ b/js/src/jsapi-tests/testPrintf.cpp
-@@ -55,7 +55,6 @@ BEGIN_TEST(testPrintf)
-     CHECK(print_one("27270", "%zu", (size_t) 27270));
-     CHECK(print_one("27270", "%" PRIuSIZE, (size_t) 27270));
-     CHECK(print_one("hello", "he%so", "ll"));
--    CHECK(print_one("(null)", "%s", zero()));
-     CHECK(print_one("0", "%p", (char *) 0));
-     CHECK(print_one("h", "%c", 'h'));
-     CHECK(print_one("1.500000", "%f", 1.5f));
--- 
-2.22.0
-

diff --git 
a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch 
b/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
deleted file mode 100644
index c3996ae82bb..00000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/config/milestone.pl       2013-02-11 17:33:22.000000000 -0500
-+++ b/js/src/config/milestone.pl       2015-07-15 10:44:31.676153600 -0400
-@@ -55,7 +55,7 @@
- #
- my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
- 
--if (defined(@TEMPLATE_FILE)) {
-+if (@TEMPLATE_FILE) {
-   my $TFILE;
- 
-   foreach $TFILE (@TEMPLATE_FILE) {

diff --git a/dev-lang/spidermonkey/metadata.xml 
b/dev-lang/spidermonkey/metadata.xml
index 309b1deffe1..fc9478d330b 100644
--- a/dev-lang/spidermonkey/metadata.xml
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -9,7 +9,6 @@
                <flag name="custom-optimization">Build with user-specified 
compiler optimizations
                        (-Os, -O0, -O1, -O2, -O3) from CFLAGS 
(unsupported)</flag>
                <flag name="debug">Enable assertions to allow for easier 
debugging of programs that link to spidermonkey -- note this will often crash 
software on regular end-user systems</flag>
-               <flag name="threadsafe">Build a threadsafe version of 
spidermonkey</flag>
                <flag name="system-icu">Use the system-wide 
<pkg>dev-libs/icu</pkg> instead of bundled -- note, only takes effect when icu 
flag is enabled</flag>
        </use>
 </pkgmetadata>

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
deleted file mode 100644
index 04d046f254e..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-MY_P="js-${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="http://archive.mozilla.org/pub/js/${MY_P}.tar.gz
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz
-       "
-
-LICENSE="NPL-1.1"
-SLOT="0/js"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       epatch "${WORKDIR}"/sm0/${PN}-1.5-build.patch \
-               "${WORKDIR}"/sm0/${PN}-1.6-header.patch \
-               "${WORKDIR}"/sm0/${P}-threadsafe.diff \
-               "${WORKDIR}"/sm0/${P}-ldflags.patch
-
-       # don't force owner for Prefix
-       sed -i -e '/^INSTALL :=/s/-g 0 -o root//' Makefile.ref || die
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk"
-       fi
-}
-
-src_compile() {
-       use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-       tc-export CC LD AR RANLIB
-       local threadsafe=""
-       use threadsafe && threadsafe="JS_THREADSAFE=1"
-       emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" ${threadsafe} \
-               XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-       emake -f Makefile.ref install DESTDIR="${ED}" LIBDIR="$(get_libdir)"
-       dodoc ../jsd/README
-       dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
deleted file mode 100644
index fcc4a0366d3..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator 
pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 
1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz
-       "
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86 
~x64-macos"
-IUSE="debug minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-       sys-libs/readline:0=
-       x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-arch/zip
-       virtual/pkgconfig"
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != "binary" ]]; then
-               export LC_ALL="C"
-       fi
-}
-
-src_prepare() {
-       # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-       epatch "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-       # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-       epatch "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=400727
-       # https://bugs.gentoo.org/show_bug.cgi?id=420471
-       epatch "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=438746
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=441928
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.5-perf_event-check.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=439260
-       epatch "${WORKDIR}"/sm0/${P}-symbol-versions.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=441934
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-fix.patch
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-static-strings.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=431560
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.5-isfinite.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=552786
-       epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=439558
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch
-       # https://bugs.gentoo.org/show_bug.cgi?id=582478
-       epatch "${WORKDIR}"/sm0/${PN}-1.8.5-gcc6.patch
-
-       epatch_user
-
-       cd "${BUILDDIR}" || die
-       eautoconf
-}
-
-src_configure() {
-       cd "${BUILDDIR}" || die
-
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-       AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-       LD="$(tc-getLD)" \
-       ac_cv_lib_dnet_dnet_ntoa=no \
-       ac_cv_lib_dnet_stub_dnet_ntoa=no \
-       econf \
-               ${myopts} \
-               --enable-jemalloc \
-               --enable-readline \
-               --enable-threadsafe \
-               --with-system-nspr \
-               --disable-optimize \
-               --disable-profile-guided-optimization \
-               $(use_enable debug) \
-               $(use_enable static-libs static) \
-               $(use_enable test tests)
-}
-
-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 jscpucfg host_jsoplengen host_jskwgen
-               cross_make -C config nsinstall
-               mv {,native-}jscpucfg || die
-               mv {,native-}host_jskwgen || die
-               mv {,native-}host_jsoplengen || die
-               mv config/{,native-}nsinstall || die
-               sed -i \
-                       -e 's@./jscpucfg@./native-jscpucfg@' \
-                       -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
-       emake
-}
-
-src_test() {
-       cd "${BUILDDIR}/jsapi-tests" || die
-       # for bug 415791
-       pax-mark mr jsapi-tests
-       emake check
-}
-
-src_install() {
-       cd "${BUILDDIR}" || die
-       emake DESTDIR="${D}" install
-       # bug 437520 , exclude js shell for small systems
-       if ! use minimal ; then
-               dobin shell/js
-               pax-mark m "${ED}/usr/bin/js"
-       fi
-       dodoc ../../README
-       dohtml README.html
-
-       if ! use static-libs; then
-               # 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' -delete || die
-       fi
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
deleted file mode 100644
index e03b5195c40..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit autotools toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 
1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz
-       "
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86 
~x64-macos"
-IUSE="debug minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-       sys-libs/readline:0=
-       x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-arch/zip
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-       "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-       "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-       "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-       "${WORKDIR}"/sm0/${P}-perf_event-check.patch
-       "${WORKDIR}"/sm0/${P}-symbol-versions.patch
-       "${WORKDIR}"/sm0/${P}-ia64-fix.patch
-       "${WORKDIR}"/sm0/${P}-ia64-static-strings.patch
-       "${WORKDIR}"/sm0/${P}-isfinite.patch
-       "${FILESDIR}"/${PN}-perl-defined-array-check.patch
-       "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch
-       "${WORKDIR}"/sm0/${P}-gcc6.patch
-       "${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch
-)
-
-DOCS=( ${S}/README )
-HTML_DOCS=( ${BUILDDIR}/README.html )
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != "binary" ]]; then
-               export LC_ALL="C"
-       fi
-}
-
-src_prepare() {
-       pwd
-
-       default
-
-       cd "${BUILDDIR}" || die
-       eautoconf
-}
-
-src_configure() {
-       cd "${BUILDDIR}" || die
-
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-       AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-       LD="$(tc-getLD)" \
-       ac_cv_lib_dnet_dnet_ntoa=no \
-       ac_cv_lib_dnet_stub_dnet_ntoa=no \
-       econf \
-               ${myopts} \
-               --enable-jemalloc \
-               --enable-readline \
-               --enable-threadsafe \
-               --with-system-nspr \
-               --disable-optimize \
-               --disable-profile-guided-optimization \
-               $(use_enable debug) \
-               $(use_enable static-libs static) \
-               $(use_enable test tests)
-}
-
-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 jscpucfg host_jsoplengen host_jskwgen
-               cross_make -C config nsinstall
-               mv {,native-}jscpucfg || die
-               mv {,native-}host_jskwgen || die
-               mv {,native-}host_jsoplengen || die
-               mv config/{,native-}nsinstall || die
-               sed -i \
-                       -e 's@./jscpucfg@./native-jscpucfg@' \
-                       -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
-       emake
-}
-
-src_test() {
-       cd "${BUILDDIR}/jsapi-tests" || die
-       # for bug 415791
-       pax-mark mr jsapi-tests
-       emake check
-}
-
-src_install() {
-       cd "${BUILDDIR}" || die
-       emake DESTDIR="${D}" install
-       # bug 437520 , exclude js shell for small systems
-       if ! use minimal ; then
-               dobin shell/js
-               pax-mark m "${ED}/usr/bin/js"
-       fi
-       einstalldocs
-
-       if ! use static-libs; then
-               # 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' -delete || die
-       fi
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild 
b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
deleted file mode 100644
index 4bade3f5fcc..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="mozjs"
-MY_P="${MY_PN}${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot17-patches-01.tar.xz";
-
-LICENSE="NPL-1.1"
-SLOT="17"
-# "MIPS, MacroAssembler is not supported" wrt #491294 for -mips
-KEYWORDS="~alpha amd64 arm -hppa ~ia64 -mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug jit minimal static-libs test"
-
-REQUIRED_USE="debug? ( jit )"
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.9.4
-       virtual/libffi
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.1.4"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-arch/zip
-       virtual/pkgconfig"
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != "binary" ]]; then
-               python-any-r1_pkg_setup
-               export LC_ALL="C"
-       fi
-}
-
-PATCHES=(
-       "${WORKDIR}"/sm17/${PN}-${SLOT}-js-config-shebang.patch
-       "${WORKDIR}"/sm17/${PN}-${SLOT}-ia64-mmap.patch
-       "${WORKDIR}"/sm17/${PN}-17.0.0-fix-file-permissions.patch
-       "${WORKDIR}"/sm17/${PN}-17-clang.patch
-       "${FILESDIR}"/${PN}-perl-defined-array-check.patch
-       "${WORKDIR}"/sm17/${PN}-17-fix_pointer_dereference.patch
-       "${FILESDIR}"/${PN}-17.0.0-unbreak-clang.patch
-)
-
-src_prepare() {
-       default
-
-       # Remove obsolete jsuword bug #506160
-       sed -i -e '/jsuword/d' "${BUILDDIR}"/jsval.h || die "sed failed"
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-}
-
-src_configure() {
-       cd "${BUILDDIR}" || die
-
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-       AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-       LD="$(tc-getLD)" \
-       econf \
-               ${myopts} \
-               --enable-jemalloc \
-               --enable-readline \
-               --enable-threadsafe \
-               --with-system-nspr \
-               --enable-system-ffi \
-               --enable-jemalloc \
-               $(use_enable debug) \
-               $(use_enable jit tracejit) \
-               $(use_enable jit methodjit) \
-               $(use_enable static-libs static) \
-               $(use_enable test tests)
-}
-
-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 host_jsoplengen host_jskwgen
-               cross_make -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
-       emake
-}
-
-src_test() {
-       cd "${BUILDDIR}/jsapi-tests" || die
-       emake check
-}
-
-src_install() {
-       cd "${BUILDDIR}" || die
-       default
-
-       if ! use minimal; then
-               if use jit; then
-                       pax-mark m "${ED}/usr/bin/js${SLOT}" || die
-               fi
-       else
-               rm -f "${ED}/usr/bin/js${SLOT}" || die
-       fi
-
-       if ! use static-libs; then
-               # 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' -delete || die
-       fi
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
deleted file mode 100644
index f0c5369b8b1..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-inherit autotools toolchain-funcs pax-utils mozcoreconf-v4
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_/.}sfink2"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot38-patches-01.tar.xz";
-
-LICENSE="NPL-1.1"
-SLOT="38"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug +jit minimal static-libs +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-#S="${WORKDIR}/${MY_P%.rc*}"
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.10.10
-       virtual/libffi
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3
-       system-icu? ( >=dev-libs/icu-51.1:= )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != "binary" ]]; then
-               moz_pkgsetup
-       fi
-}
-
-src_prepare() {
-       eapply "${WORKDIR}"/sm38/${PN}-38-jsapi-tests.patch \
-               "${WORKDIR}"/sm38/mozjs38-1269317.patch \
-               "${WORKDIR}"/sm38/mozjs38-fix-tracelogger.patch \
-               "${WORKDIR}"/sm38/mozjs38-copy-headers.patch \
-               "${WORKDIR}"/sm38/mozjs38-pkg-config-version.patch \
-               "${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch \
-               "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
-
-       eapply_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       cd "${BUILDDIR}" || die
-       eautoconf
-}
-
-src_configure() {
-       export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
-
-       cd "${BUILDDIR}" || die
-
-       econf \
-               --enable-jemalloc \
-               --enable-readline \
-               --enable-threadsafe \
-               --with-system-nspr \
-               --enable-system-ffi \
-               --disable-optimize \
-               --with-intl-api \
-               $(use_with system-icu) \
-               $(use_enable debug) \
-               $(use_enable jit yarr-jit) \
-               $(use_enable jit ion) \
-               $(use_enable static-libs static) \
-               $(use_enable test tests)
-}
-
-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
-
-       mv "${ED}"usr/bin/js-config{,${SLOT}} || die
-       mv "${ED}"usr/bin/js{,${SLOT}} || die
-       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
-
-       if ! use static-libs; then
-               # 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
-       fi
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild 
b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
deleted file mode 100644
index e1093fef43d..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-inherit autotools toolchain-funcs pax-utils mozcoreconf-v4
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_/.}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
-       https://dev.gentoo.org/~axs/distfiles/${PN}-slot45-patches-01.tar.xz";
-
-LICENSE="NPL-1.1"
-SLOT="45"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="debug +jit minimal static-libs +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.10.10
-       virtual/libffi
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3
-       system-icu? ( >=dev-libs/icu-51.1:= )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != "binary" ]]; then
-               moz_pkgsetup
-       fi
-}
-
-src_prepare() {
-       eapply "${WORKDIR}"/sm45/${PN}-38-jsapi-tests.patch \
-               "${WORKDIR}"/sm45/mozjs45-1266366.patch \
-               "${WORKDIR}"/sm45/mozjs38-pkg-config-version.patch \
-               "${WORKDIR}"/sm45/mozilla_configure_regexp_esr.patch \
-               "${WORKDIR}"/sm45/${PN}-${SLOT}-dont-symlink-non-objfiles.patch 
\
-               "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
-
-       # apply relevant (modified) patches from gentoo's firefox-45 patchset
-       eapply "${WORKDIR}"/sm45/ff45
-
-       eapply_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       cd "${BUILDDIR}" || die
-       eautoconf
-}
-
-src_configure() {
-       export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
-       cd "${BUILDDIR}" || die
-
-       econf \
-               --enable-jemalloc \
-               --enable-readline \
-               --enable-threadsafe \
-               --with-system-nspr \
-               --enable-system-ffi \
-               --disable-optimize \
-               --with-intl-api \
-               $(use_with system-icu) \
-               $(use_enable debug) \
-               $(use_enable jit yarr-jit) \
-               $(use_enable jit ion) \
-               $(use_enable static-libs static) \
-               $(use_enable test tests)
-}
-
-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
-
-       # re-slot due to upstream stripping out most of the slotting
-       mv "${ED}"usr/bin/js-config{,${SLOT}} || die
-       mv "${ED}"usr/bin/js{,${SLOT}} || die
-       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
-
-       if ! use static-libs; then
-               # 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
-       fi
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild 
b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild
deleted file mode 100644
index 60b24598dbd..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-inherit autotools toolchain-funcs pax-utils mozcoreconf-v5
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_rc/.rc}"
-MY_P="${MY_P/_pre/pre}"
-DESCRIPTION="Stand-alone JavaScript C++ library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-#SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2";
-SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2
 -> ${MY_P}.tar.bz2
-       https://dev.gentoo.org/~axs/distfiles/${PN}-52.0-patches-0.tar.xz";
-
-LICENSE="NPL-1.1"
-SLOT="52"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="debug minimal +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-BUILDDIR="${S}/jsobj"
-
-RDEPEND=">=dev-libs/nspr-4.13.1
-       virtual/libffi
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3
-       system-icu? ( >=dev-libs/icu-58.1:= )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-       [[ ${MERGE_TYPE} == "binary" ]] || \
-               moz_pkgsetup
-
-       export SHELL="${EPREFIX}/bin/bash"
-}
-
-src_prepare() {
-       # remove patches integrated by upstream
-       rm -f   
"${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch
 \
-               "${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \
-               
"${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \
-               "${WORKDIR}"/${PN}/0008-tests-Skip-on-all-64-bit-archs.patch \
-               || die
-
-       eapply "${WORKDIR}/${PN}"
-       eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
-       eapply "${FILESDIR}"/${PN}-52.0-fix-alpha-bitness.patch
-       eapply "${FILESDIR}"/${PN}-52.0-gcc9-overflow.patch
-
-       eapply_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       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/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
-
-       ECONF_SOURCE="${S}/js/src" \
-       econf \
-               --enable-jemalloc \
-               --enable-readline \
-               --with-system-nspr \
-               --disable-optimize \
-               --with-intl-api \
-               --disable-gold \
-               $(use_with system-icu) \
-               $(use_enable debug) \
-               $(use_enable test tests) \
-               XARGS="/usr/bin/xargs" \
-               SHELL="${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}" \
-               SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-               "$@"
-}
-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}" \
-       SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-       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
-       SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-       emake DESTDIR="${D}" install
-
-       if ! use minimal; then
-               pax-mark m "${ED}"usr/bin/js${SLOT}
-       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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild 
b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
deleted file mode 100644
index 7be1933706b..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-inherit autotools toolchain-funcs pax-utils mozcoreconf-v5
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_rc/.rc}"
-MY_P="${MY_P/_pre/pre}"
-DESCRIPTION="Stand-alone JavaScript C++ library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-#SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2";
-SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2
 -> ${MY_P}.tar.bz2
-       https://dev.gentoo.org/~axs/distfiles/${PN}-52.0-patches-0.tar.xz";
-
-LICENSE="NPL-1.1"
-SLOT="52"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86"
-IUSE="debug minimal +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-BUILDDIR="${S}/jsobj"
-
-RDEPEND=">=dev-libs/nspr-4.13.1
-       virtual/libffi
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3
-       system-icu? ( >=dev-libs/icu-58.1:= )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-       [[ ${MERGE_TYPE} == "binary" ]] || \
-               moz_pkgsetup
-
-       export SHELL="${EPREFIX}/bin/bash"
-}
-
-src_prepare() {
-       # remove patches integrated by upstream
-       rm -f   
"${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch
 \
-               "${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \
-               
"${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \
-               "${WORKDIR}"/${PN}/0008-tests-Skip-on-all-64-bit-archs.patch \
-               || die
-
-       eapply "${WORKDIR}/${PN}"
-       eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
-       eapply "${FILESDIR}"/${PN}-52.0-fix-alpha-bitness.patch
-       eapply "${FILESDIR}"/${PN}-52.0-gcc9-overflow.patch
-
-       eapply_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       cd "${S}"/js/src || die
-       eautoconf old-configure.in
-       eautoconf
-
-       # 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
-
-       ECONF_SOURCE="${S}/js/src" \
-       econf \
-               --enable-jemalloc \
-               --enable-readline \
-               --with-system-nspr \
-               --disable-optimize \
-               --with-intl-api \
-               --disable-gold \
-               $(use_with system-icu) \
-               $(use_enable debug) \
-               $(use_enable test tests) \
-               XARGS="/usr/bin/xargs" \
-               SHELL="${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}" \
-               SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-               "$@"
-}
-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}" \
-       SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-       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
-       SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-       emake DESTDIR="${D}" install
-
-       if ! use minimal; then
-               pax-mark m "${ED}"usr/bin/js${SLOT}
-       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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild 
b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
deleted file mode 100644
index 2a4f79590c7..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 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
-
-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 s390 sparc x86"
-IUSE="debug +jit minimal +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-
-BUILDDIR="${S}/jsobj"
-
-RDEPEND=">=dev-libs/nspr-4.13.1
-       virtual/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_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       cd "${S}/js/src" || die
-       eautoconf old-configure.in
-       eautoconf
-
-       # 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
-
-       ECONF_SOURCE="${S}/js/src" \
-       econf \
-               --disable-jemalloc \
-               --enable-readline \
-               --with-system-nspr \
-               --with-system-zlib \
-               --disable-optimize \
-               --with-intl-api \
-               $(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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild 
b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild
deleted file mode 100644
index 5054d72cc08..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 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
-
-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 ~s390 ~sparc 
~x86"
-IUSE="debug +jit minimal +system-icu test"
-
-RESTRICT="!test? ( test ) ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-
-BUILDDIR="${S}/jsobj"
-
-RDEPEND=">=dev-libs/nspr-4.13.1
-       virtual/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_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk" || die
-       fi
-
-       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
-
-       ECONF_SOURCE="${S}/js/src" \
-       econf \
-               --disable-jemalloc \
-               --enable-readline \
-               --with-system-nspr \
-               --with-system-zlib \
-               --disable-optimize \
-               --with-intl-api \
-               $(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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild
deleted file mode 100644
index bc95dc96070..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs python-any-r1
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR="1"
-
-# Convert the ebuild version to the upstream mozilla version
-MOZ_PV="${MY_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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-       # ESR releases have slightly different version numbers
-       MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-FIREFOX_PATCHSET="firefox-68.0-patches-14"
-SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases";
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-       
MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
-       MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-PATCH_URIS=(
-       
https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
-       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
-)
-
-SRC_URI="${MOZ_SRC_URI}
-       ${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
-
-SLOT="68"
-LICENSE="MPL-2.0"
-IUSE="debug +jit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/python:2.7
-       test? ( ${PYTHON_DEPS} )"
-
-DEPEND=">=dev-libs/icu-63.1:=
-       >=dev-libs/nspr-4.21
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-pkg_pretend() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_setup
-
-       use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       cd ../.. || die
-       rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
-       rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
-       eapply "${WORKDIR}"/firefox
-       eapply "${WORKDIR}"/spidermonkey-patches
-
-       default
-
-       MOZJS_BUILDDIR="${WORKDIR}/build"
-       mkdir "${MOZJS_BUILDDIR}" || die
-
-       cd "${S}" || die
-       eautoconf
-}
-
-src_configure() {
-       tc-export CC CXX LD AR RANLIB
-
-       # backup current active Python version
-       local PYTHON_OLD=${PYTHON}
-
-       # build system will require Python2.7
-       export PYTHON=python2.7
-
-       cd "${MOZJS_BUILDDIR}" || die
-
-       # ../python/mach/mach/mixin/process.py fails to detect SHELL
-       export SHELL="${EPREFIX}/bin/bash"
-
-       # forcing system-icu allows us to skip patching bundled ICU for PPC
-       # and other minor arches
-       ECONF_SOURCE="${S}" \
-       econf \
-               --host="${CBUILD:-${CHOST}}" \
-               --target="${CHOST}" \
-               --disable-jemalloc \
-               --disable-optimize \
-               --disable-strip \
-               --enable-readline \
-               --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 ion) \
-               $(use_enable test tests) \
-               XARGS="${EPREFIX}/usr/bin/xargs"
-
-       # restore PYTHON
-       export PYTHON=${PYTHON_OLD}
-}
-
-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
-
-       local -a KNOWN_TESTFAILURES
-       KNOWN_TESTFAILURES+=( 
test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/timeZone_backward_links.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
-       KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
-       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
-
-       echo "" > "${T}"/known_failures.list || die
-
-       local KNOWN_TESTFAILURE
-       for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-               echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
-       done
-
-       PYTHONPATH="${S}/tests/lib" \
-               ${PYTHON} \
-               "${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
-               KNOWN_TESTFAILURES=()
-
-               echo "" > "${T}"/known_failures.list || die
-
-               for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-                       echo "${KNOWN_TESTFAILURE}" >> 
"${T}"/known_failures.list
-               done
-
-               PYTHONPATH="${S}/tests/lib" \
-                       ${PYTHON} \
-                       "${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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-68.11.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-68.11.0.ebuild
deleted file mode 100644
index 42affb52847..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-68.11.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs python-any-r1
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR="1"
-
-# Convert the ebuild version to the upstream mozilla version
-MOZ_PV="${MY_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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-       # ESR releases have slightly different version numbers
-       MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-FIREFOX_PATCHSET="firefox-68.0-patches-15"
-SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases";
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-       
MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
-       MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-PATCH_URIS=(
-       
https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
-       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
-)
-
-SRC_URI="${MOZ_SRC_URI}
-       ${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
-
-SLOT="68"
-LICENSE="MPL-2.0"
-IUSE="debug +jit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/python:2.7
-       test? ( ${PYTHON_DEPS} )"
-
-DEPEND=">=dev-libs/icu-63.1:=
-       >=dev-libs/nspr-4.21
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-pkg_pretend() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_setup
-
-       use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       cd ../.. || die
-       rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
-       rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
-       eapply "${WORKDIR}"/firefox
-       eapply "${WORKDIR}"/spidermonkey-patches
-
-       default
-
-       # 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"
-
-       MOZJS_BUILDDIR="${WORKDIR}/build"
-       mkdir "${MOZJS_BUILDDIR}" || die
-
-       cd "${S}" || die
-       eautoconf
-}
-
-src_configure() {
-       tc-export CC CXX LD AR RANLIB
-
-       # backup current active Python version
-       local PYTHON_OLD=${PYTHON}
-
-       # build system will require Python2.7
-       export PYTHON=python2.7
-
-       cd "${MOZJS_BUILDDIR}" || die
-
-       # ../python/mach/mach/mixin/process.py fails to detect SHELL
-       export SHELL="${EPREFIX}/bin/bash"
-
-       # forcing system-icu allows us to skip patching bundled ICU for PPC
-       # and other minor arches
-       ECONF_SOURCE="${S}" \
-       econf \
-               --host="${CBUILD:-${CHOST}}" \
-               --target="${CHOST}" \
-               --disable-jemalloc \
-               --disable-optimize \
-               --disable-strip \
-               --enable-readline \
-               --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 ion) \
-               $(use_enable test tests) \
-               XARGS="${EPREFIX}/usr/bin/xargs"
-
-       # restore PYTHON
-       export PYTHON=${PYTHON_OLD}
-}
-
-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
-
-       local -a KNOWN_TESTFAILURES
-       KNOWN_TESTFAILURES+=( 
test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/timeZone_backward_links.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
-       KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
-       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
-
-       echo "" > "${T}"/known_failures.list || die
-
-       local KNOWN_TESTFAILURE
-       for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-               echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
-       done
-
-       PYTHONPATH="${S}/tests/lib" \
-               ${PYTHON} \
-               "${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
-               KNOWN_TESTFAILURES=()
-
-               echo "" > "${T}"/known_failures.list || die
-
-               for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-                       echo "${KNOWN_TESTFAILURE}" >> 
"${T}"/known_failures.list
-               done
-
-               PYTHONPATH="${S}/tests/lib" \
-                       ${PYTHON} \
-                       "${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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-68.7.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-68.7.0.ebuild
deleted file mode 100644
index 27c1b4f3fb2..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-68.7.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs python-any-r1
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR="1"
-
-# Convert the ebuild version to the upstream mozilla version
-MOZ_PV="${MY_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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-       # ESR releases have slightly different version numbers
-       MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-FIREFOX_PATCHSET="firefox-68.0-patches-12"
-SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases";
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-       
MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
-       MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-PATCH_URIS=(
-       
https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
-       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
-)
-
-SRC_URI="${MOZ_SRC_URI}
-       ${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
-
-SLOT="68"
-LICENSE="MPL-2.0"
-IUSE="debug +jit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/python:2.7
-       test? ( ${PYTHON_DEPS} )"
-
-DEPEND=">=dev-libs/icu-63.1:=
-       >=dev-libs/nspr-4.21
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-pkg_pretend() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_setup
-
-       use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       cd ../.. || die
-       rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
-       rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
-       eapply "${WORKDIR}"/firefox
-       eapply "${WORKDIR}"/spidermonkey-patches
-
-       default
-
-       MOZJS_BUILDDIR="${WORKDIR}/build"
-       mkdir "${MOZJS_BUILDDIR}" || die
-
-       cd "${S}" || die
-       eautoconf
-}
-
-src_configure() {
-       tc-export CC CXX LD AR RANLIB
-
-       # backup current active Python version
-       local PYTHON_OLD=${PYTHON}
-
-       # build system will require Python2.7
-       export PYTHON=python2.7
-
-       cd "${MOZJS_BUILDDIR}" || die
-
-       # ../python/mach/mach/mixin/process.py fails to detect SHELL
-       export SHELL="${EPREFIX}/bin/bash"
-
-       # forcing system-icu allows us to skip patching bundled ICU for PPC
-       # and other minor arches
-       ECONF_SOURCE="${S}" \
-       econf \
-               --disable-jemalloc \
-               --disable-optimize \
-               --disable-strip \
-               --enable-readline \
-               --enable-shared-js \
-               --with-intl-api \
-               --with-system-icu \
-               --with-system-nspr \
-               --with-system-zlib \
-               $(use_enable debug) \
-               $(use_enable jit ion) \
-               $(use_enable test tests) \
-               XARGS="${EPREFIX}/usr/bin/xargs"
-
-       # restore PYTHON
-       export PYTHON=${PYTHON_OLD}
-}
-
-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
-
-       local -a KNOWN_TESTFAILURES
-       KNOWN_TESTFAILURES+=( 
test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
-       KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
-       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
-
-       echo "" > "${T}"/known_failures.list || die
-
-       local KNOWN_TESTFAILURE
-       for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-               echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
-       done
-
-       PYTHONPATH="${S}/tests/lib" \
-               ${PYTHON} \
-               "${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
-               KNOWN_TESTFAILURES=()
-
-               echo "" > "${T}"/known_failures.list || die
-
-               for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-                       echo "${KNOWN_TESTFAILURE}" >> 
"${T}"/known_failures.list
-               done
-
-               PYTHONPATH="${S}/tests/lib" \
-                       ${PYTHON} \
-                       "${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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild
deleted file mode 100644
index b69b7f5d7c7..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs python-any-r1
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR="1"
-
-# Convert the ebuild version to the upstream mozilla version
-MOZ_PV="${MY_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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-       # ESR releases have slightly different version numbers
-       MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-FIREFOX_PATCHSET="firefox-68.0-patches-14"
-SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases";
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-       
MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
-       MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-PATCH_URIS=(
-       
https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
-       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
-)
-
-SRC_URI="${MOZ_SRC_URI}
-       ${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
-
-SLOT="68"
-LICENSE="MPL-2.0"
-IUSE="debug +jit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/python:2.7
-       test? ( ${PYTHON_DEPS} )"
-
-DEPEND=">=dev-libs/icu-63.1:=
-       >=dev-libs/nspr-4.21
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-pkg_pretend() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_setup
-
-       use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       cd ../.. || die
-       rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
-       rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
-       eapply "${WORKDIR}"/firefox
-       eapply "${WORKDIR}"/spidermonkey-patches
-
-       default
-
-       MOZJS_BUILDDIR="${WORKDIR}/build"
-       mkdir "${MOZJS_BUILDDIR}" || die
-
-       cd "${S}" || die
-       eautoconf
-}
-
-src_configure() {
-       tc-export CC CXX LD AR RANLIB
-
-       # backup current active Python version
-       local PYTHON_OLD=${PYTHON}
-
-       # build system will require Python2.7
-       export PYTHON=python2.7
-
-       cd "${MOZJS_BUILDDIR}" || die
-
-       # ../python/mach/mach/mixin/process.py fails to detect SHELL
-       export SHELL="${EPREFIX}/bin/bash"
-
-       # forcing system-icu allows us to skip patching bundled ICU for PPC
-       # and other minor arches
-       ECONF_SOURCE="${S}" \
-       econf \
-               --disable-jemalloc \
-               --disable-optimize \
-               --disable-strip \
-               --enable-readline \
-               --enable-shared-js \
-               --with-intl-api \
-               --with-system-icu \
-               --with-system-nspr \
-               --with-system-zlib \
-               $(use_enable debug) \
-               $(use_enable jit ion) \
-               $(use_enable test tests) \
-               XARGS="${EPREFIX}/usr/bin/xargs"
-
-       # restore PYTHON
-       export PYTHON=${PYTHON_OLD}
-}
-
-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
-
-       local -a KNOWN_TESTFAILURES
-       KNOWN_TESTFAILURES+=( 
test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
-       KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
-       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
-
-       echo "" > "${T}"/known_failures.list || die
-
-       local KNOWN_TESTFAILURE
-       for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-               echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
-       done
-
-       PYTHONPATH="${S}/tests/lib" \
-               ${PYTHON} \
-               "${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
-               KNOWN_TESTFAILURES=()
-
-               echo "" > "${T}"/known_failures.list || die
-
-               for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-                       echo "${KNOWN_TESTFAILURE}" >> 
"${T}"/known_failures.list
-               done
-
-               PYTHONPATH="${S}/tests/lib" \
-                       ${PYTHON} \
-                       "${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
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-68.9.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-68.9.0.ebuild
deleted file mode 100644
index b69b7f5d7c7..00000000000
--- a/dev-lang/spidermonkey/spidermonkey-68.9.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs python-any-r1
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR="1"
-
-# Convert the ebuild version to the upstream mozilla version
-MOZ_PV="${MY_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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-       # ESR releases have slightly different version numbers
-       MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-FIREFOX_PATCHSET="firefox-68.0-patches-14"
-SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases";
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-       
MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}";
-       MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-PATCH_URIS=(
-       
https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
-       
https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
-)
-
-SRC_URI="${MOZ_SRC_URI}
-       ${PATCH_URIS[@]}"
-
-DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
-
-SLOT="68"
-LICENSE="MPL-2.0"
-IUSE="debug +jit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/python:2.7
-       test? ( ${PYTHON_DEPS} )"
-
-DEPEND=">=dev-libs/icu-63.1:=
-       >=dev-libs/nspr-4.21
-       sys-libs/readline:0=
-       >=sys-libs/zlib-1.2.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${MY_PV}/js/src"
-
-pkg_pretend() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if use test ; then
-               CHECKREQS_DISK_BUILD="6G"
-       else
-               CHECKREQS_DISK_BUILD="5G"
-       fi
-
-       check-reqs_pkg_setup
-
-       use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       cd ../.. || die
-       rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
-       rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
-       eapply "${WORKDIR}"/firefox
-       eapply "${WORKDIR}"/spidermonkey-patches
-
-       default
-
-       MOZJS_BUILDDIR="${WORKDIR}/build"
-       mkdir "${MOZJS_BUILDDIR}" || die
-
-       cd "${S}" || die
-       eautoconf
-}
-
-src_configure() {
-       tc-export CC CXX LD AR RANLIB
-
-       # backup current active Python version
-       local PYTHON_OLD=${PYTHON}
-
-       # build system will require Python2.7
-       export PYTHON=python2.7
-
-       cd "${MOZJS_BUILDDIR}" || die
-
-       # ../python/mach/mach/mixin/process.py fails to detect SHELL
-       export SHELL="${EPREFIX}/bin/bash"
-
-       # forcing system-icu allows us to skip patching bundled ICU for PPC
-       # and other minor arches
-       ECONF_SOURCE="${S}" \
-       econf \
-               --disable-jemalloc \
-               --disable-optimize \
-               --disable-strip \
-               --enable-readline \
-               --enable-shared-js \
-               --with-intl-api \
-               --with-system-icu \
-               --with-system-nspr \
-               --with-system-zlib \
-               $(use_enable debug) \
-               $(use_enable jit ion) \
-               $(use_enable test tests) \
-               XARGS="${EPREFIX}/usr/bin/xargs"
-
-       # restore PYTHON
-       export PYTHON=${PYTHON_OLD}
-}
-
-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
-
-       local -a KNOWN_TESTFAILURES
-       KNOWN_TESTFAILURES+=( 
test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
-       KNOWN_TESTFAILURES+=( 
non262/Intl/DateTimeFormat/tz-environment-variable.js )
-       KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
-       KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
-       KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
-       KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
-
-       echo "" > "${T}"/known_failures.list || die
-
-       local KNOWN_TESTFAILURE
-       for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-               echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
-       done
-
-       PYTHONPATH="${S}/tests/lib" \
-               ${PYTHON} \
-               "${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
-               KNOWN_TESTFAILURES=()
-
-               echo "" > "${T}"/known_failures.list || die
-
-               for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
-                       echo "${KNOWN_TESTFAILURE}" >> 
"${T}"/known_failures.list
-               done
-
-               PYTHONPATH="${S}/tests/lib" \
-                       ${PYTHON} \
-                       "${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
-}

diff --git a/profiles/arch/ia64/package.use.mask 
b/profiles/arch/ia64/package.use.mask
index e155c770183..17c90c29cb0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -112,7 +112,6 @@ app-admin/syslog-ng kafka
 # No ia64 arch support for jit. Version 17 USE=debug
 # required USE=jit.
 dev-lang/spidermonkey jit
-=dev-lang/spidermonkey-17* debug
 
 # Mart Raudsepp <l...@gentoo.org> (2019-03-17)
 # Unkeyworded media-libs/opencv dependency, bug #680656

Reply via email to