From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Jan 2021 21:06:00 +0000
Subject: gentoo new year resync : 01.01.2021

---
 dev-lang/Manifest.gz                               | Bin 17003 -> 16993 bytes
 dev-lang/cfortran/Manifest                         |   2 +-
 dev-lang/cfortran/cfortran-4.4-r3.ebuild           |   2 +-
 dev-lang/duktape/Manifest                          |   2 +-
 dev-lang/duktape/duktape-2.6.0.ebuild              |   2 +-
 dev-lang/erlang/Manifest                           |   4 +-
 dev-lang/erlang/erlang-23.1.4.ebuild               |   2 +-
 dev-lang/erlang/erlang-23.2.1.ebuild               | 159 +++++
 dev-lang/hy/Manifest                               |   6 -
 dev-lang/hy/hy-0.14.0.ebuild                       |  40 --
 dev-lang/hy/hy-0.15.0.ebuild                       |  45 --
 dev-lang/hy/hy-0.16.0.ebuild                       |  45 --
 dev-lang/julia/Manifest                            |   4 +-
 dev-lang/julia/julia-1.5.2-r1.ebuild               |   2 +-
 dev-lang/julia/julia-1.5.3.ebuild                  |  11 +-
 dev-lang/lua/Manifest                              |  19 +-
 dev-lang/lua/files/lua-5.1.5-make.patch            |  97 +++
 dev-lang/lua/files/lua-5.2.4-make.patch            |  75 +++
 dev-lang/lua/files/lua-5.3.6-make.patch            |  91 +++
 dev-lang/lua/files/lua-5.4.2-make.patch            |  99 ++++
 dev-lang/lua/lua-5.1.5-r105.ebuild                 | 150 -----
 dev-lang/lua/lua-5.1.5-r106.ebuild                 | 151 +++++
 dev-lang/lua/lua-5.1.5-r4.ebuild                   |   2 +-
 dev-lang/lua/lua-5.1.5-r5.ebuild                   | 113 ----
 dev-lang/lua/lua-5.2.4-r2.ebuild                   | 202 -------
 dev-lang/lua/lua-5.2.4-r3.ebuild                   | 200 +++++++
 dev-lang/lua/lua-5.3.6-r1.ebuild                   | 202 -------
 dev-lang/lua/lua-5.3.6-r2.ebuild                   | 200 +++++++
 dev-lang/lua/lua-5.4.1-r1.ebuild                   | 199 -------
 dev-lang/lua/lua-5.4.2-r1.ebuild                   | 197 +++++++
 dev-lang/moarvm/Manifest                           |   2 +
 dev-lang/moarvm/moarvm-2020.12.ebuild              |  61 ++
 dev-lang/mujs/Manifest                             |   2 +-
 dev-lang/mujs/mujs-1.0.9.ebuild                    |   2 +-
 dev-lang/nqp/Manifest                              |   2 +
 dev-lang/nqp/nqp-2020.12.ebuild                    | 160 +++++
 dev-lang/ocaml/Manifest                            |   2 +
 dev-lang/ocaml/ocaml-4.10.2.ebuild                 |  79 +++
 dev-lang/perl/Manifest                             |  10 +-
 .../perl/files/perl-5.30.3-darwin-macos11.patch    | 180 ++++++
 dev-lang/perl/perl-5.30.3-r1.ebuild                |  14 +-
 dev-lang/perl/perl-5.30.3-r2.ebuild                |  14 +-
 dev-lang/perl/perl-5.30.3.ebuild                   |   4 +-
 dev-lang/perl/perl-5.32.0-r1.ebuild                |  18 +-
 dev-lang/perl/perl-5.32.0.ebuild                   | 655 ---------------------
 dev-lang/python-exec/Manifest                      |   4 +-
 dev-lang/python-exec/python-exec-2.4.6-r2.ebuild   |   2 +-
 dev-lang/python-exec/python-exec-2.4.6-r3.ebuild   |   2 +-
 dev-lang/python/Manifest                           |   6 +-
 dev-lang/python/python-3.10.0_alpha1.ebuild        | 331 -----------
 dev-lang/python/python-3.10.0_alpha3.ebuild        |   7 +-
 dev-lang/python/python-3.8.7_rc1.ebuild            | 355 -----------
 dev-lang/rakudo/Manifest                           |   2 +
 dev-lang/rakudo/rakudo-2020.12.ebuild              |  73 +++
 dev-lang/ruby/Manifest                             |  11 +-
 dev-lang/ruby/files/3.0/001-socksocket-fix.patch   |  15 +
 .../ruby/files/3.0/010-default-gem-location.patch  |  20 +
 dev-lang/ruby/ruby-2.5.8-r1.ebuild                 |   2 +-
 dev-lang/ruby/ruby-2.6.6-r2.ebuild                 |   2 +-
 dev-lang/ruby/ruby-2.7.2.ebuild                    |   2 +-
 dev-lang/ruby/ruby-3.0.0-r1.ebuild                 | 262 +++++++++
 dev-lang/ruby/ruby-3.0.0.ebuild                    | 262 +++++++++
 dev-lang/spidermonkey/Manifest                     |   6 +-
 dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild |   2 +-
 .../spidermonkey-52.9.1_pre1-r2.ebuild             |   2 +-
 .../spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild  |   2 +-
 dev-lang/swig/Manifest                             |   6 +-
 dev-lang/swig/swig-3.0.12.ebuild                   |   2 +-
 dev-lang/swig/swig-4.0.0.ebuild                    |   2 +-
 dev-lang/swig/swig-4.0.2.ebuild                    |   2 +-
 dev-lang/tcl/Manifest                              |   9 +-
 dev-lang/tcl/files/tcl-8.6.10-multilib.patch       |  11 +
 dev-lang/tcl/tcl-8.5.17-r1.ebuild                  |   2 +-
 dev-lang/tcl/tcl-8.6.10.ebuild                     | 136 +++++
 dev-lang/tcl/tcl-8.6.8.ebuild                      |   2 +-
 dev-lang/tcl/tcl-8.6.9-r1.ebuild                   |   2 +-
 dev-lang/tk/Manifest                               |   8 +-
 dev-lang/tk/files/tk-8.6.10-multilib.patch         |  11 +
 dev-lang/tk/files/tk-8.6.10-test.patch             | 527 +++++++++++++++++
 dev-lang/tk/tk-8.5.17-r1.ebuild                    |   2 +-
 dev-lang/tk/tk-8.6.10.ebuild                       | 153 +++++
 dev-lang/tk/tk-8.6.8.ebuild                        |   2 +-
 dev-lang/whitespace/Manifest                       |   4 +-
 dev-lang/whitespace/metadata.xml                   |   3 -
 dev-lang/whitespace/whitespace-0.4.ebuild          |  22 +-
 85 files changed, 3359 insertions(+), 2445 deletions(-)
 create mode 100644 dev-lang/erlang/erlang-23.2.1.ebuild
 delete mode 100644 dev-lang/hy/hy-0.14.0.ebuild
 delete mode 100644 dev-lang/hy/hy-0.15.0.ebuild
 delete mode 100644 dev-lang/hy/hy-0.16.0.ebuild
 create mode 100644 dev-lang/lua/files/lua-5.1.5-make.patch
 create mode 100644 dev-lang/lua/files/lua-5.2.4-make.patch
 create mode 100644 dev-lang/lua/files/lua-5.3.6-make.patch
 create mode 100644 dev-lang/lua/files/lua-5.4.2-make.patch
 delete mode 100644 dev-lang/lua/lua-5.1.5-r105.ebuild
 create mode 100644 dev-lang/lua/lua-5.1.5-r106.ebuild
 delete mode 100644 dev-lang/lua/lua-5.1.5-r5.ebuild
 delete mode 100644 dev-lang/lua/lua-5.2.4-r2.ebuild
 create mode 100644 dev-lang/lua/lua-5.2.4-r3.ebuild
 delete mode 100644 dev-lang/lua/lua-5.3.6-r1.ebuild
 create mode 100644 dev-lang/lua/lua-5.3.6-r2.ebuild
 delete mode 100644 dev-lang/lua/lua-5.4.1-r1.ebuild
 create mode 100644 dev-lang/lua/lua-5.4.2-r1.ebuild
 create mode 100644 dev-lang/moarvm/moarvm-2020.12.ebuild
 create mode 100644 dev-lang/nqp/nqp-2020.12.ebuild
 create mode 100644 dev-lang/ocaml/ocaml-4.10.2.ebuild
 create mode 100644 dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
 delete mode 100644 dev-lang/perl/perl-5.32.0.ebuild
 delete mode 100644 dev-lang/python/python-3.10.0_alpha1.ebuild
 delete mode 100644 dev-lang/python/python-3.8.7_rc1.ebuild
 create mode 100644 dev-lang/rakudo/rakudo-2020.12.ebuild
 create mode 100644 dev-lang/ruby/files/3.0/001-socksocket-fix.patch
 create mode 100644 dev-lang/ruby/files/3.0/010-default-gem-location.patch
 create mode 100644 dev-lang/ruby/ruby-3.0.0-r1.ebuild
 create mode 100644 dev-lang/ruby/ruby-3.0.0.ebuild
 create mode 100644 dev-lang/tcl/files/tcl-8.6.10-multilib.patch
 create mode 100644 dev-lang/tcl/tcl-8.6.10.ebuild
 create mode 100644 dev-lang/tk/files/tk-8.6.10-multilib.patch
 create mode 100644 dev-lang/tk/files/tk-8.6.10-test.patch
 create mode 100644 dev-lang/tk/tk-8.6.10.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d28e39ce5028..f1019d984c3d 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index c8e3417e447b..4a2018043651 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -1,4 +1,4 @@
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
-EBUILD cfortran-4.4-r3.ebuild 1139 BLAKE2B df98cd0527c4d2e8c8c1e588b48a12ec61128ad7c8cf04abff1e82f9eb22b8248d54203f99ac4235c5d33b50ed06f046875442e0cc731e6250e7b81180ac1603 SHA512 f6701f05634dded0839f9b2e17fc24cc79411113ea65c2a466e3e05463ec03fc334b0fdf4993428c29d08681b3c1aead517f6e7cd546b788b446de229a6b6db0
+EBUILD cfortran-4.4-r3.ebuild 1140 BLAKE2B b24b1f5610391dd363bdebbe0588667f462b335cfa90e6c91c18f9712fb129f237e1aa2593d4932e5ad182574fa8f78f520fb94bd247f266da5d595f47a1ed8f SHA512 3ecd6fd78955dff48feb6f83e8865796b3dca3d0afa1b91ea75708004540f810a4af2069fd177e5ffeea9848eea4e1bab98534c89bd06dff9bbfada3cc4047c9
 MISC metadata.xml 588 BLAKE2B 9e2c3b0818a3bbc250153d807eb81d08f24d5568fc34eb83aef2a9344c59ca998fe488d27e8d23bc1381e21580015df60519698369394c17361111e470a9313b SHA512 4cc9d7ec3c44afc7e8ca2b43c04ea67c88fa1be09f9c594d83d1d011823566efd4e6b889fc4e95b019885be4223de32d94e0126acf70fe5e7cabf753a9923d40
diff --git a/dev-lang/cfortran/cfortran-4.4-r3.ebuild b/dev-lang/cfortran/cfortran-4.4-r3.ebuild
index 15332f28a3be..c719a1ea9f6d 100644
--- a/dev-lang/cfortran/cfortran-4.4-r3.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples"
 
 src_unpack() {
diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest
index c7fcb7f58f60..c7ace744d752 100644
--- a/dev-lang/duktape/Manifest
+++ b/dev-lang/duktape/Manifest
@@ -5,5 +5,5 @@ DIST duktape-2.5.0.tar.xz 1031188 BLAKE2B 15d9190e9c723bacf8249ea31bf528793ca06e
 DIST duktape-2.6.0.tar.xz 1035160 BLAKE2B 98155e1bf7e76aab37f5ccdb951d9d456df3d984ebed5058d8931e25317ffd94b4d95f08e102eb6eb2fa36ab6d2d60be6072b4101b7754e1c1440f7d6fb2c91b SHA512 d72a2aaa05391fa243861aca6ca6082f91a08b9c5d60c7b246d35d7161532b0048bb67bd8fec7996c700ee317ac2bb52e528582682e5425b0431757d8b1c5be4
 EBUILD duktape-2.4.0.ebuild 984 BLAKE2B 639c3dbdb610048fc33134671a428deca1fe106f5f54cc7baee3d21b921265c63e168208501e6aaea0f91a578f2d33dd5b110d14f25a7d198542be944346a957 SHA512 7bcadb6b1e5a246bf2b62b3f3ccb7dfc50e9232508d86fbef1481b8b08fdd1b810e5010eff72fb8f88eb590f39ba711294bbd1b9207eeeb524032a57fb10170e
 EBUILD duktape-2.5.0-r1.ebuild 1070 BLAKE2B 32767172e822423930b4bdfd536e5219039d3aab8edd7238a5da030e3e9932733a9b11a0e060180240c2cd82bc9520bd87be705ab6593dfbb56842b6310e2760 SHA512 e6c0e7e07ad49e8dd507cf41cfcc2986847df6d111f2db25fc2b8485f76daa38d4aad3776eb12d4fd2ec2d4c0b8505dc621fba340b1d8badd285a85b23759ec9
-EBUILD duktape-2.6.0.ebuild 1194 BLAKE2B 00c8239847f63013031cf86846f3fb0d48b8e3c7d83aa5cc1c8ab7c60863d0a9754fb2f3ac21e11e53e8f147bb8972dcd82c99db62af71774b0ddc6bb5a49440 SHA512 5a76c71249ea43a7d6cab0d84abbdf8952f5b6b17d8ff60f15d0fec47e997fe1362e2616b77ee58df22b6a37feb04e527a2164e61eddbca9ef86a69ade2fd0ff
+EBUILD duktape-2.6.0.ebuild 1193 BLAKE2B 7de457244db5c94d747ad71bb99112a45d1235980d427481363fc01f78b9577852dcba741f19fb6c75062fbcd7a5819fa2ef2eb3f9d781c1e8a83be47391b3ce SHA512 21a4125c7f3f9489b46cc7abfb96423dca7a8417e8739ebe1ee94088241e4495689a0f35f5af6459d3b366f37073a7161ecab813af9ebe310dc4bced880e4742
 MISC metadata.xml 337 BLAKE2B cccca86d6da0b932668171e11dcee8ae4e2261c9d701a56aa1e6edae82223f23616ecc71df2686df63fe36c11a3d9918f53621df798afca36907b0561c537f78 SHA512 31661ed6f1e4d86566e596bcf2f26bd8daf967b609fda7101abba3c4186246a3e952bb71c9d5e71ff3b2692bc9d016d96282387268e9a06231e22ce4bd5afa9d
diff --git a/dev-lang/duktape/duktape-2.6.0.ebuild b/dev-lang/duktape/duktape-2.6.0.ebuild
index 1037f1a821ba..eb4779a22dc7 100644
--- a/dev-lang/duktape/duktape-2.6.0.ebuild
+++ b/dev-lang/duktape/duktape-2.6.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
 # Upstream don't maintain binary compatibility
 # https://github.com/svaarala/duktape/issues/1524
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-respect-tc-env.patch"
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9373cd665aac..a813855a5f9f 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -11,6 +11,7 @@ DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b2
 DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9
 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
 DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
+DIST erlang-23.2.1.tar.gz 56580525 BLAKE2B 4b5d4be9d0501dd2eb5d44357ccc9a169dc3b5742380264a7929e6aebf1d003327b2c109aa7dc4ad668f1576376e54022ff240f41df7af9010184d643eae2371 SHA512 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531
 DIST erlang-23.2.tar.gz 56581092 BLAKE2B f3191b99465ab18eaf13c6d15f79ae150fb04337450b3ff145532aab0da229c44c082bb138a79c84860f09107a363c34e2b2505ce38c6c8dea1ede5fbe3ce044 SHA512 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
@@ -20,7 +21,8 @@ DIST erlang_doc_man_23.1.tar.gz 1384042 BLAKE2B 914f64d9317e45e22dc0a3025306d36f
 DIST erlang_doc_man_23.2.tar.gz 1386417 BLAKE2B 91fb2646461330c2f3793e7819e4c77ba9259366098b710fd102ffbcbcf38fa84ad720613313e3c59c1d419aaddd5a1a85d26c5d41a71d6692d428a494f57012 SHA512 464fa2c3608a6c096a241e5fc2cee710ef51394b169e3b3ce3ab5f69d847437c54780d4afc1a799d13f88ea88ac64056b19bff4d927e1e6bbe54a773b0ccd89d
 EBUILD erlang-23.0.4.ebuild 4574 BLAKE2B 09f50e6cd3bb9d1066e76b7642b758ae980158303472efd97ad3306a4d7ac64000eee51f126cbc28d2e5daa967081492d97f937d240673f9899413ac438dcbb8 SHA512 faf0daa84d3641e09c8fba82ad632ac08b8335b94b5e812dc66a3849508f8bd062698fc3dc9ee90927eb72f21f87d59c99f7da841d196f70e4ed15873ddfdbf8
 EBUILD erlang-23.1.1.ebuild 4574 BLAKE2B 09f50e6cd3bb9d1066e76b7642b758ae980158303472efd97ad3306a4d7ac64000eee51f126cbc28d2e5daa967081492d97f937d240673f9899413ac438dcbb8 SHA512 faf0daa84d3641e09c8fba82ad632ac08b8335b94b5e812dc66a3849508f8bd062698fc3dc9ee90927eb72f21f87d59c99f7da841d196f70e4ed15873ddfdbf8
-EBUILD erlang-23.1.4.ebuild 4620 BLAKE2B dddab89d8d76d58b1f1906dd1031ec7a9edebac6f1924532fd4c1b6c36aebcad03d6864c0d3c89913996d5974abecf9f43a34edea5e6e6042d1f356fe958f483 SHA512 3bc2d2b400241421d30c885c5cc114c11505be5118767484669a87bc397859d20d4bf7976cea03015c198f6da6d9bc9aebc5e7cbf8de9b63d6253e64a38b4167
+EBUILD erlang-23.1.4.ebuild 4616 BLAKE2B d63459510a5fd99438093d8321496868b814c7086a4fe402b2f26a5a8fd47decce6dc21ad3013bde7795f4a258d2b6be3da4a1a298608b0f5b93439b2af70d8f SHA512 6842e640be07872625f9f04a235375c14082842506c4da0b4b7308bdf194bedf67a5bc043dd4c2ae02751e3921fda61ad636f2b2c753670306d091861a28f3fe
 EBUILD erlang-23.1.5.ebuild 4620 BLAKE2B dddab89d8d76d58b1f1906dd1031ec7a9edebac6f1924532fd4c1b6c36aebcad03d6864c0d3c89913996d5974abecf9f43a34edea5e6e6042d1f356fe958f483 SHA512 3bc2d2b400241421d30c885c5cc114c11505be5118767484669a87bc397859d20d4bf7976cea03015c198f6da6d9bc9aebc5e7cbf8de9b63d6253e64a38b4167
+EBUILD erlang-23.2.1.ebuild 4620 BLAKE2B dddab89d8d76d58b1f1906dd1031ec7a9edebac6f1924532fd4c1b6c36aebcad03d6864c0d3c89913996d5974abecf9f43a34edea5e6e6042d1f356fe958f483 SHA512 3bc2d2b400241421d30c885c5cc114c11505be5118767484669a87bc397859d20d4bf7976cea03015c198f6da6d9bc9aebc5e7cbf8de9b63d6253e64a38b4167
 EBUILD erlang-23.2.ebuild 4620 BLAKE2B dddab89d8d76d58b1f1906dd1031ec7a9edebac6f1924532fd4c1b6c36aebcad03d6864c0d3c89913996d5974abecf9f43a34edea5e6e6042d1f356fe958f483 SHA512 3bc2d2b400241421d30c885c5cc114c11505be5118767484669a87bc397859d20d4bf7976cea03015c198f6da6d9bc9aebc5e7cbf8de9b63d6253e64a38b4167
 MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2
diff --git a/dev-lang/erlang/erlang-23.1.4.ebuild b/dev-lang/erlang/erlang-23.1.4.ebuild
index a809e52a684b..b8fd47e9f5e2 100644
--- a/dev-lang/erlang/erlang-23.1.4.ebuild
+++ b/dev-lang/erlang/erlang-23.1.4.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-23.2.1.ebuild b/dev-lang/erlang/erlang-23.2.1.ebuild
new file mode 100644
index 000000000000..a809e52a684b
--- /dev/null
+++ b/dev-lang/erlang/erlang-23.2.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/18.2.1-wx3.0.patch
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/hy/Manifest b/dev-lang/hy/Manifest
index 4cc2fa1c8934..704f5b68fd7b 100644
--- a/dev-lang/hy/Manifest
+++ b/dev-lang/hy/Manifest
@@ -1,10 +1,4 @@
 AUX hy-0.15.0-do-not-install-get_version.py.patch 569 BLAKE2B 548cec5bc35f65721b4c8109256e79f2cbf8d2ba6620b66f88618678f73c6117c354622ffdce4936ccbd3574d3f3ce3517eb7f763bf5d770ac652992c81a1cea SHA512 c9ea2ae683ec8391192918cf0173e598732f1d5c1e4cd0814c63b20055c781b8a194694f6ed2585cb4acd43756650a8d9e6d3918956521c24b7c798ee8bdcec1
-DIST hy-0.14.0.tar.gz 403692 BLAKE2B 4d20574151c443e002e365bceecc11b2bdcd7aa294073c58cba4ec8a958534c9f1256848ef57e4d5dd3ec345decaa53db43768a78af542ba8a59ff50489486b1 SHA512 a04da48592058b8ad3e7d2a787149622bfcf61c01a341ccc166c2e25e18ed7616b6567b529cf4f6d80a9cecf44aac175577ebf185c77e941a11a258f8563da9e
-DIST hy-0.15.0.tar.gz 411900 BLAKE2B 88a7500ecebacd7995aba1efbabead22ce656b1d6e275c5c726ce9b27746729344adfd35f2dfb4247c6d41101317eecfd98e0379e84f88ffea85bfaef2101797 SHA512 d4a08c7df494c5f9ae9a48e51b642cf8c30850209765fb80304132b57fb1133a839c82945662550d1417f4cae4e15f25da388be180143ed7b28fe8d5129844cc
-DIST hy-0.16.0.tar.gz 434727 BLAKE2B 05c490049355b496901aea70449e9c30a414bcdd7a5d4a430a672d424eeaa20845d58fd6967433058d4ab6b2969d5744bfdf5dd9cfe976888aeeb35d36a98f91 SHA512 ee9555a58a52bd894904fb0c4892a5c3f0a02b5ab45107ce6ed028840251cc8bd0b1c6264f0f1a345a63352c662861cf3b94049fd58f374dd2ca706ee89c2a4c
 DIST hy-0.17.0.tar.gz 438729 BLAKE2B f699198a3181592dc0a1c12ecb85defce5ee592eb3c949635f37af36f39f452b081b18b46a122d515a7246d448c1710eedd8015a14f18dc074c61f0cfccecf8f SHA512 18601bf47df2120f8833a1ae211c416dc90825f31cd50b259adfe0585089a623d0fea13512b2935b093e14d8595c93bc1610939d5f1d664f6acf7ddf7e341542
-EBUILD hy-0.14.0.ebuild 950 BLAKE2B 99b474a795f12f6e1ecde7a277481f1375134773992eefd4151dfe6fc3c5a7e851c0269c032f250da3b597548288b1ffecac06bd65de58dbdbe6d1a3967d494b SHA512 2b8953f58afb843cb41f778dd4467f5be885d65dea9f32c8c0b05b6dffb921956d8988a39ac9cd213399aa4e0a3b7ceffe84d3f26943e9b6b3bd098e53db8fb6
-EBUILD hy-0.15.0.ebuild 1096 BLAKE2B a2d2a2aff6a7f59d0981b5c068fc16dd71166627b83b24b119af45772ea9cf0b942adf7b101f77246d81cbd7b54127b261e52c2e94b1722d1b5c086fe6a8885c SHA512 0e1bb4ce8c99234742b5fd10cd8d515ab2f80ca53f8d7012db445633f9493f5a2e8c0bcecb0cce9ea238c07cf6eb3f35d63b8e85127b3652ebe7bbe5643b0033
-EBUILD hy-0.16.0.ebuild 1102 BLAKE2B 53fbd7ea1d8936aad1c7d64bb2af8d1186c4849e0f98959fc0b63418837e9cfa18d22cc666b14d9f1db9a180f7135348b3aaaea4ef87e9efb3cf8f94539072ee SHA512 7792e358c10020da334c4afe842150359fef774591820804bbd3bf5f769c698ee0a7f109940e6f80601572227b95bf3fd5df2730c54abf68baca92719496531b
 EBUILD hy-0.17.0.ebuild 1100 BLAKE2B 63446f7bf3f6607420ecc2f1506e0e6c2f385d9a108e05b8c04fb64b412264316ac930334cf6030dccb0556596a72b0a242fa1d230fabc4162ff195298de3798 SHA512 9fe9755063f2e5c9a727e9aa7873b9295044ac6cef2920f28c7b29067a3d462e592b652a2d0dc462fa9a4033273022a59c584362a9ba7c0656b125bc44d05945
 MISC metadata.xml 331 BLAKE2B 1377771edc92d3cd1ea685b43816a4ffd6c84d06245f00414df594d9d1aee498ca2a5ede2d92c2f0607fd26127730a8f7e1e6eadf6fd916325967b282e32f092 SHA512 97afa7992933d5088e939afd4005e188fd2979ccf7fc21561561b14e1eecfee61e867288c21b4a396fc5ca4926fd3d62c9d8c5be217b9392a5208371fa3aa719
diff --git a/dev-lang/hy/hy-0.14.0.ebuild b/dev-lang/hy/hy-0.14.0.ebuild
deleted file mode 100644
index 1a9be26d43d1..000000000000
--- a/dev-lang/hy/hy-0.14.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1 eutils
-DESCRIPTION="A LISP dialect running in python"
-HOMEPAGE="http://hylang.org/"
-SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]
-	>=dev-python/rply-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/astor-0.6[${PYTHON_USEDEP}]
-	>=dev-python/clint-0.4[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-src_prepare() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-}
-
-python_compile_all() {
-	use doc && emake docs
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-lang/hy/hy-0.15.0.ebuild b/dev-lang/hy/hy-0.15.0.ebuild
deleted file mode 100644
index fff33b321870..000000000000
--- a/dev-lang/hy/hy-0.15.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1 eutils
-DESCRIPTION="A LISP dialect running in python"
-HOMEPAGE="http://hylang.org/"
-SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
-
-RDEPEND=">=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/clint-0.4[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/rply-0.7.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.0-do-not-install-get_version.py.patch )
-
-src_prepare() {
-	default
-	use doc && HTML_DOCS=( docs/_build/html/. )
-}
-
-python_compile_all() {
-	use doc && emake docs
-}
-
-python_test() {
-	nosetests -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-lang/hy/hy-0.16.0.ebuild b/dev-lang/hy/hy-0.16.0.ebuild
deleted file mode 100644
index 01a6a7380102..000000000000
--- a/dev-lang/hy/hy-0.16.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit distutils-r1 eutils
-DESCRIPTION="A LISP dialect running in python"
-HOMEPAGE="http://hylang.org/"
-SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
-
-RDEPEND=">=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/clint-0.4[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/rply-0.7.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.0-do-not-install-get_version.py.patch )
-
-src_prepare() {
-	default
-	use doc && HTML_DOCS=( docs/_build/html/. )
-}
-
-python_compile_all() {
-	use doc && emake docs
-}
-
-python_test() {
-	nosetests -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 3596c417f5e2..06fbb57207cb 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -11,6 +11,6 @@ DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
 DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
 DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
-EBUILD julia-1.5.2-r1.ebuild 5851 BLAKE2B 2adae861d29bbdf096b8958cd0f6fa29d79ebdf75e2f1ca186d079f500aec2b43eab57c2e9c49c0b53be3ea34d9f8c7b5bed23b9c82da5e7c3ed2ad13f224535 SHA512 7a006f9960b6e203da663e763faf606cebfdec5a21a5feedca6c282cd32a7c86635d5bd9a384a8a7bff9c2c284e16162f185854c139ea544b7a406f5e676f77e
-EBUILD julia-1.5.3.ebuild 6019 BLAKE2B c5177b6c69d9f90ea2bd6a55f880b1fbbb179ffaab5522f66ea2f35d58ef493f8f567cad779b5bdf6d085c03e3902bffbbf34a6b883f4d2e3d6a6ee6681719ac SHA512 66a2e5e9c0aa55006d032848a46c2ebae341c301f0750c382b976d4d9c3d7b55616935f201d14d286f9378fbc4ec6aa8155b60e5919a51f74661c8ecdecef2a8
+EBUILD julia-1.5.2-r1.ebuild 5859 BLAKE2B ea9d7704aa427f936df848f0a9aa1897b01f5f375379ca78cc3c14709c6a2d1a53222c8576b4cf12797918529922c553a4be4442e73d3120669ea00bcc2ca04d SHA512 42299e82b2d07964e70be5556dab6bc6ba3eaa9c9fa533d9d139067934315f8e7b6897ada249892d04d8e3fab303d38502cb83633c1498ca89d59c290f38c427
+EBUILD julia-1.5.3.ebuild 6067 BLAKE2B 027053e1570505acb7feb8bff3776169847e01b0a1232c6ac104ee77f44117ac7c97061fb59bb5fa55d1dcc319d4dfa7eb97c84dbd15ba0a1a34b7f3c47e5681 SHA512 f82396f0e0eecb1723d269c890e1f684f9834804e95a7b8fcc88661907ed1cc7a33c74ddc9d7f0f4ff36a345f316cb6a9a1f012a6f54b02ff672369af0516093
 MISC metadata.xml 1388 BLAKE2B b58f320281f3b56151e4f647b3124b2bd915c9194041c7aa3e228cceb56f1d4d6625b9b86394a39c1fb7c0bb524e792cd60576ec76a766dba41204297d792ddd SHA512 91835d230909a2d10ac26280e49d3538e57fc708f141ce366d55d21dc66b588e551aa4e054e76a44695c065a82e6aa09962b84e86eb1f4f12b87ecd90ca256b5
diff --git a/dev-lang/julia/julia-1.5.2-r1.ebuild b/dev-lang/julia/julia-1.5.2-r1.ebuild
index 5460b616b194..22f76c79cf80 100644
--- a/dev-lang/julia/julia-1.5.2-r1.ebuild
+++ b/dev-lang/julia/julia-1.5.2-r1.ebuild
@@ -200,7 +200,7 @@ src_install() {
 	rmdir "${ED}"/usr/share/doc/julia || die
 
 	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 
 pkg_postinst() {
diff --git a/dev-lang/julia/julia-1.5.3.ebuild b/dev-lang/julia/julia-1.5.3.ebuild
index 58e0c6d0bba6..ebff8169d4a0 100644
--- a/dev-lang/julia/julia-1.5.3.ebuild
+++ b/dev-lang/julia/julia-1.5.3.ebuild
@@ -52,8 +52,8 @@ RDEPEND+="
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
-	>=net-libs/mbedtls-2.2
 	net-libs/libssh2
+	>=net-libs/mbedtls-2.2
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
@@ -65,6 +65,7 @@ RDEPEND+="
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
+	sci-mathematics/z3
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -180,17 +181,17 @@ src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 
-	emake julia-release \
+	emake \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-	emake
 }
 
 src_install() {
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
+		BUNDLE_DEBUG_LIBS=0
 
 	if ! use system-llvm ; then
 		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
@@ -204,7 +205,7 @@ src_install() {
 	rmdir "${ED}"/usr/share/doc/julia || die
 
 	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 
 pkg_postinst() {
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index bfc13415a53a..799e16aa3b9e 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -20,22 +20,25 @@ AUX lua-5.1.4-test.patch 271 BLAKE2B 1b8d2fd524d34fce99315d03232984a3cd1ad74fb23
 AUX lua-5.1.5-disable-deprecated.patch 1823 BLAKE2B 82d9e7c12d98606b29960182d8e069704683e136e06f422d6109a3c2ade165bc12e151d9e1c7933c65be3b441f1363db4f054866c0c7a894e9282a82b01a435d SHA512 1dc8f8a789bc8374137adce70c6614afe383255b5a2e59e36fdddf5a8fb9c7458b42e7b4483f09635d0ec38f8ed7925f8d1f12ce0fe0fdf0373a8e59b6f84322
 AUX lua-5.1.5-fix_vararg_calls.patch 470 BLAKE2B fa5863445dbca630dbe00fd03a09f752dc27d0106cb7a5cc8bddf51dc9bd01ae843ad29219ed2ba29dd3088b933bcbf91fc87d5c58a972f4bac99fe112f05aff SHA512 630e8537bd80771fecc4c8216ec96e243654bd0b7bd006b6867baca4effab90bab4a922951661d4fc3ac2700c3bd7c0c40227b9eeee7dd5a87c07a6382055b04
 AUX lua-5.1.5-gentoo-build.patch 3108 BLAKE2B fae72673638387311749949840ce3df6f56763af6f5027c9f71c2262abdf3ed1cc2fe49fccb3ceef110584ac5034b1dceef03c773b68c12558b30c33ea6a10d4 SHA512 85165a0cae5f951d53741a7a07bc291bf16a4e575d82262b744ba177dfee54a91acc37000e17299f4f6a13acf8b611aac618e257b45e4f65012a9cf632ab4ab7
+AUX lua-5.1.5-make.patch 3079 BLAKE2B cf9b72afd8e08ea23256364f321d49427661de8353f7655b9da3de1ef943125ae86cf1a7aab9f1c459e51063031eb1105b7703ad9e1aee90a848497b58addb12 SHA512 92a1c890e40a8bd621dad4a18fc890850027c4a5a239b8259ef3002ad4835a7a11069ca964a62a096cd651a688b60f5f261c1223e4ac7981e7a8bb43788634ff
 AUX lua-5.1.5-readline.patch 638 BLAKE2B 9f15fc99ae7abaa6b99ed0e1daf45bc6c8d2980159e3f721d3ec415108c0b612091822c56177804a333dc0abe038229d5adcd8982e50712dcee4b493d8ff04e1 SHA512 0167466adde2827455587001c02ab1cedd3845b6646cd3ce58f85d808157c0d9320106a8055319c338640b4494152e0b494fe92943070d4cdbdfcc1cfd44c82e
 AUX lua-5.2-make-r1.patch 2410 BLAKE2B e2c8607c96dcc89ee130aa2a24eb8ca3c0191902528fab1563f40f2c26a5c12c40b5c41679df6a5997821c0cf08ea87e12bbfe2ac09470ab93285255935eba14 SHA512 e34b41740e672ba3511569884fe053a2d71e197f6738f1c22f74f7ffc657cb7b91e6efe97374730a5f8f6e82419a30d3b96e9af0b3a66caf78c523a4493492b8
+AUX lua-5.2.4-make.patch 2418 BLAKE2B 89f3f8d0222041200cee33079686d049800f74dd6d796205a4089f09a44884d0aa111d47203e778f80e5acdde1d56ad3f87c9a00fc832ec0e0f20d7b518e48c7 SHA512 0f9d7bd63ce6e9aeecd5286fc7069421e2a0e9cffd707d8af96dbce1c8c623084032480e3a16b69f28c44019f284a73390faf84a24e738273f556c5998a5d1e6
 AUX lua-5.3-make-r1.patch 2822 BLAKE2B 4b12793d85e28d69a871c946f48a4f7e3b326dc78167e7ed1c207fab77883bb47f845c24a08ababa69c146e60f548f0f6eb2ae8b70b670b540124ca4d3628485 SHA512 40692d71a7ca59d495f8af7969ccc295373e5b0993b67142c43dcb216d57893da41fcf7d1bc49382fc89986eedaaa0f7da6fe62b42e41ac450c30dfa6d4bcdec
+AUX lua-5.3.6-make.patch 2830 BLAKE2B 9d3ea717531d93d7f7618335f503528e629aa3582392c49e340b6909860a51e30371530ea06ef1ed81cc4bde4a294e1d6732662703f646a7a3f727159dc83fed SHA512 5d5f0a02f2e11cb7965702ffb2f65c0f19184ae4e27c28e57a100c35e8972e2fba419999af63b65b0f031880dda7851816cef126088ddb105b29d401d03e1132
 AUX lua-5.4-makefiles.patch 3187 BLAKE2B 22911f5fd5d26753e952cd435350cc120f7736a3a1fe4301d58265965c36a0d64a98af731f186b0374f7fb29f8a2ddcf3a95fc6746b3955295dc8e8a5425b62c SHA512 5df57cf6379f245f855423d6fee33d9e42f4100aa69d19bc9b608db7e7001ef3c9e74c81f97b9e74e8decd78c149bc4689d56008a1704054c6e416c892c362f3
+AUX lua-5.4.2-make.patch 3179 BLAKE2B 68e9af77c2f5931234eefbe953ff127c3b32bdfa67917075435531d43672304e599e706dba2012cf6a13645803b611bee437f2f28137ed0daff9fdfc4afc4b79 SHA512 09cfcea9b736ef90d035a1d2bd7480b813edd99aa7c5ecd4b52a9fbd2bf479623db6045be89642bd3867b5ca143c5640c53a7d72951b33ab4832b9a6323a88b7
 AUX lua.pc 658 BLAKE2B 580504c8162c9cbde35b4a817c688b955cad1a35b1c21ed527488eda6e7cf78dfa81fa8b100737cf9ad620d34d94eceec01ba09e4fab0b121c5e4c673677cd3f SHA512 cb476ea6dd004a9aa0094cfc219d1888c5f578b44968a960acf1f2f32783a8e4d770bb033fb1ab4851f225188bbdd434b5d239718cae2c2c35f5b5f124a722ca
 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
 DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8
 DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
 DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
-DIST lua-5.4.1-tests.tar.gz 128646 BLAKE2B 2dae666e89bacf986228a33fc665bbc510e738d9f8791933f5048e4bbecaf6cd59c5e70e488d332b16960225aac3b9fae46e500f3b54856bb6aabe8cd3a5c932 SHA512 ac7cf113d96f8fe2af4f104297a70debd3bede5997627fc18db6b5d9c78ff49e05a165f5855894def5656c6dcc2d7d9ccce741c90da17698a5c714a33828f49a
-DIST lua-5.4.1.tar.gz 353965 BLAKE2B e5b46fcf2eb2ea9bd235793cefec2bf19f185ed51b11bc6133bda4e3639f09194378b2fd55544972ee32576751e80bba87b3b61ec3d4a0910592d6e5cb4a4c77 SHA512 49ffbe814ec41e515fc8502b6958151c6c56aa171412f0b211ad9de934be2c958c3709d49435885ddea0fa6765ed511dafb3537558950ff3b4261338214f1571
-EBUILD lua-5.1.5-r105.ebuild 4047 BLAKE2B 91971f1b59e3a7c94a2ef4f7585a6925e54e74ae5a677c2880c97a2ba839ed43e4fdcea1e48ab09a0e029fa6699e830350326329298c63375624aa5973da3861 SHA512 dc3642a6527797d706ad2413efb9be5e4079cbcdf8d7d59684ae59364f18a342cddff5d92596de42d2b34c316e9127446521c9f18026ad56686031746d0d9fb7
-EBUILD lua-5.1.5-r4.ebuild 3626 BLAKE2B b8940a7010239a29ad1920fe7d9e9f799ac1472c10ec92f4b24f122afbc9dce6bc807e93b4e1f4f0c4413661dc28d5205a2e53c5228a34e2e26b26d184e2d24e SHA512 89721d186390aae36b3b64f0c12ddbd14f8dec843e4f46b0ac6e384c39f6c70d657827ac0af24db51733f8fc534168859391178804c0c06920071f66c2e14235
-EBUILD lua-5.1.5-r5.ebuild 3181 BLAKE2B 190ef3d7da2eaada3c3eb25e5d524e4b3efb81d77d7ae566b25713b50cad8f2c7822eb490a4ebdf0ab6eb3f6f6d9a5ac0c6bc813f7d0329905b9f98e6ca04213 SHA512 7497bf82661f2c17c4cf07ff6511b8595f06336defbad1feb2ac483ef024ae6473bec3cdcb925b9d18eaa5091980f1c10c21ea1d48418af1d0cd5ced4cc3b349
-EBUILD lua-5.2.4-r2.ebuild 5815 BLAKE2B e3741fe56b47d500f6bf9ed09a9b4345564e9beaeae4546860223d5bf97d6099db6cd5e4799f2e85b793fe67f3233e291476a9dca68b1a5389a15a3be69667d8 SHA512 1d07f7d52b8c6a773d486d83dfdb2a13b8504c065a68cf500fca4fc086c9a49bbe489e03151b05af42d74e20627a13b879131aade0a941439c923efa69014041
-EBUILD lua-5.3.6-r1.ebuild 5800 BLAKE2B d3ba9b65ef465fd0ba3350eacc83d282618591c72e4866c7f1730406c118f2956cb53e2f0b015d14cfe2ed601820e44cd415658f518512fe6f811438b9d15c6a SHA512 e25977c341752f4f3e65aac0746969df628009e288bb81545e4b7897e6a4d56da0f6021c59162ad7473ff0487e2aa71015f2ca75d893c84fe883f447e911c241
-EBUILD lua-5.4.1-r1.ebuild 5763 BLAKE2B c36fbfbfe4d672a96334fc9a8d02ebe727490b3bc674a9895a9e90a315a2d507e04925392f9a02a848e0514de5eb2937680c3fb32da863f2f0fa5f90d2d330b0 SHA512 7469c2131d815a830eee6822623022ea29ae6526534eff52ad983955ae521e2165a07c15ada3daec2547b633d22f1b99cb5d5a8ebf158a9a98948ab864f2b294
+DIST lua-5.4.2-tests.tar.gz 128901 BLAKE2B 10e4f0e8760f9cbd4761fa26665008ae7412539f79a6a7687029808f08f0ae4a24721e787e2e87e5080c16e9dcce8577a7a39ddc6d3e483a3cfe11756139594e SHA512 1516c59deca211c38444bbf97b18e988e939209b03915d3691d756eeed31b52e8d3a1f05b71ac0b561965274c7b6f3afc4244cd2e9069995696e737e2d9dd40b
+DIST lua-5.4.2.tar.gz 353472 BLAKE2B 7e0e642684df635ed1c48db45989e86a2638024e30a170addf700b0c7d32276f1eaef80898539c671039c20cb0bed4861b12c58f4b8211653a17e89bad278d87 SHA512 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920
+EBUILD lua-5.1.5-r106.ebuild 4040 BLAKE2B c7fc570461c3d6683c1f916213c1529a5eca0ddc923a38a4f5ca140b9f1390766226dd2f94be28ed99a0cad9c5e51c77bc93a388101c4547f22958b26e2bf08c SHA512 1fac4df1b91756d832b5f415c541d1085ce20808cc293b3108d6be99776f8d817be1057499422f6c026ac2b93c267cf3004d4f05faabfe4baf8508b00d71a3fe
+EBUILD lua-5.1.5-r4.ebuild 3617 BLAKE2B a5eef5cf7e7419c6ab130768b094ec0cf20e8b66bd60637d78adcfe03bf56ef6ff82a99a71190177d6457a118e91b68a5ab132afef06a9dabfffb962500581c0 SHA512 e613f945395ddf642bf5d8613f01b6d536fe7c35bde4a0009335eed65ff872384e272eaecee8cb408cd76cc75af6aaca6b7c6c0361d63188d5dc8f3089ceb0f5
+EBUILD lua-5.2.4-r3.ebuild 5779 BLAKE2B a9d7b0cf295ef6d2dd959ef1b7d04a1db966562bac30492c1d67a195601145fea03213295cfe7a0a60aa4d9f851f71661dee42a9dce2ef0c279cdb04084e4078 SHA512 e740561dd931bede1dd8def84b88ec493b880e22f28789d04a560c08c03b7fe319f6f645d5c583cafa4a9e1f859cdd0a9f47115c6ca4cf7b0445abd6287fafd0
+EBUILD lua-5.3.6-r2.ebuild 5764 BLAKE2B 3d7250d840406b8b76e80d5389e2fc1d8e31a13fa6379ffd9da64e765e7187f962145daaaad8db1f948f963b94e9a30041269dd53fdf9ef0ac56583b9c3d16c1 SHA512 7ad3147fe330d8ac979f6eedd18356fead9286395f7861a5e1d548e40dc46dcdeb849eeea57892a42393a1223b246f81ec84ebe0039d2abcceb3914b26a174bd
+EBUILD lua-5.4.2-r1.ebuild 5704 BLAKE2B b893018704077a96dd2e5942a961f559253d46f65501ea3849790d422ae8907e31e2eff3f77cd780fd81846f4ca4c6715acaa9d88aa8653e88af8e67b05ebc37 SHA512 ed8892acb8870299ab8d781d71e4edddde3ac11ba9a97bc72b82a6c5ced5ba8d04748d90d191c8f4a67731515f468b8bd525523a6e5d812e2545f83645ae3868
 MISC metadata.xml 524 BLAKE2B 688341a9dfa433bbc2e3fc1edb8a44d53dcee036afeb5b2c7c8fbfa0f81d1e53a6c7910b32bec637ad1cd518e48afdd0806a286dadbb6c7a88853a93aa7f3545 SHA512 92ee6e13c3fcc5ba1d2cf3ec58a54b051f1fae8646b64fae25923108a78abc77b05992abbed5a04afbc2043ea0b47749544e348506ab554d57b19bcf3b435e52
diff --git a/dev-lang/lua/files/lua-5.1.5-make.patch b/dev-lang/lua/files/lua-5.1.5-make.patch
new file mode 100644
index 000000000000..032652c0a5e1
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.5-make.patch
@@ -0,0 +1,97 @@
+diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile
+--- lua-5.1.5.orig/Makefile	2014-04-15 17:43:34.845435031 +0200
++++ lua-5.1.5/Makefile	2014-04-15 19:05:08.669304987 +0200
+@@ -11,7 +11,7 @@
+ # so take care if INSTALL_TOP is not an absolute path.
+ INSTALL_TOP= /usr/local
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua$V
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+ INSTALL_MAN= $(INSTALL_TOP)/man/man1
+ #
+@@ -126,3 +126,21 @@
+ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++gentoo_clean:
++	cd src; $(MAKE) $@
++
++gentoo_test: gentoo_linux
++	test/lua.static test/hello.lua
++
++gentoo_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
+diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile
+--- lua-5.1.5.orig/src/Makefile	2014-04-15 17:43:34.844435031 +0200
++++ lua-5.1.5/src/Makefile	2014-04-15 18:07:21.427397122 +0200
+@@ -29,10 +29,10 @@
+ LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+ 	lstrlib.o loadlib.o linit.o
+ 
+-LUA_T=	lua
++LUA_T= lua$V
+ LUA_O=	lua.o
+ 
+-LUAC_T=	luac
++LUAC_T= 	luac$V
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+@@ -51,10 +51,10 @@
+ 	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ clean:
+@@ -180,3 +180,33 @@
+   ltm.h lzio.h lmem.h lopcodes.h lundump.h
+ 
+ # (end of Makefile)
++
++export LIBTOOL = libtool --tag=CC
++export LIB_VERSION = 5:1:5
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua$V.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
++
++gentoo_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
++
++gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.2.4-make.patch b/dev-lang/lua/files/lua-5.2.4-make.patch
new file mode 100644
index 000000000000..40e1f5aa7d0c
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.2.4-make.patch
@@ -0,0 +1,75 @@
+--- lua-5.1.1.orig/Makefile	2006-06-02 12:53:38.000000000 +0200
++++ lua-5.1.1/Makefile	2006-11-16 02:16:53.000000000 +0100
+@@ -11,7 +11,7 @@
+ # so take care if INSTALL_TOP is not an absolute path.
+ INSTALL_TOP= /usr/local
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua$V
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+ INSTALL_MAN= $(INSTALL_TOP)/man/man1
+ #
+@@ -127,3 +127,18 @@
+ .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++gentoo_clean:
++	cd src; $(MAKE) $@
++
++gentoo_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
+--- lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
++++ lua-5.1.1/src/Makefile	2006-11-16 02:10:27.000000000 +0100
+@@ -39,1 +39,1 @@
+-LUA_T=	lua
++LUA_T= lua$V
+@@ -42,1 +42,1 @@
+-LUAC_T=	luac
++LUAC_T= 	luac$V
+@@ -54,1 +54,1 @@
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+@@ -57,1 +57,1 @@
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+@@ -185,3 +185,30 @@
+ lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
+  lzio.h
+
++
++export LIBTOOL = libtool --quiet --tag=CC
++export LIB_VERSION = 6:1:1
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua$V.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
++
++gentoo_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
++
++gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.3.6-make.patch b/dev-lang/lua/files/lua-5.3.6-make.patch
new file mode 100644
index 000000000000..6e842caf4f65
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.3.6-make.patch
@@ -0,0 +1,91 @@
+diff -uNr lua-5.3.3.orig/Makefile lua-5.3.3/Makefile
+--- lua-5.3.3.orig/Makefile	2016-12-04 22:29:54.839135901 +0100
++++ lua-5.3.3/Makefile	2016-12-04 22:31:14.235851109 +0100
+@@ -12,7 +12,7 @@
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+ INSTALL_TOP= /usr/local
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua$V
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+ INSTALL_MAN= $(INSTALL_TOP)/man/man1
+ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+@@ -112,3 +112,18 @@
+ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++gentoo_clean:
++	cd src; $(MAKE) $@
++
++gentoo_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
+diff -uNr lua-5.3.3.orig/src/Makefile lua-5.3.3/src/Makefile
+--- lua-5.3.3.orig/src/Makefile	2016-12-04 22:29:54.840135910 +0100
++++ lua-5.3.3/src/Makefile	2016-12-04 22:34:55.980848068 +0100
+@@ -36,10 +36,10 @@
+ 	lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+ 
+-LUA_T=	lua
++LUA_T= lua$V
+ LUA_O=	lua.o
+ 
+-LUAC_T=	luac
++LUAC_T= 	luac$V
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+@@ -59,10 +59,10 @@
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ clean:
+@@ -195,3 +195,30 @@
+  lobject.h ltm.h lzio.h
+ 
+ # (end of Makefile)
++
++export LIBTOOL = libtool --quiet --tag=CC
++export LIB_VERSION = 6:1:1
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua$V.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
++
++gentoo_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
++
++gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.4.2-make.patch b/dev-lang/lua/files/lua-5.4.2-make.patch
new file mode 100644
index 000000000000..8758e88de91b
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.4.2-make.patch
@@ -0,0 +1,99 @@
+diff --git a/Makefile b/Makefile
+index 1797df9..90284d8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,11 +10,11 @@ PLAT= guess
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= /usr
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua$V
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
+ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+@@ -104,3 +104,18 @@ pc:
+ .PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++gentoo_clean:
++	cd src; $(MAKE) $@
++
++gentoo_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
+diff --git a/src/Makefile b/src/Makefile
+index 514593d..8af8f99 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -37,10 +37,10 @@ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+ 
+-LUA_T=	lua
++LUA_T=	lua$V
+ LUA_O=	lua.o
+ 
+-LUAC_T=	luac
++LUAC_T=	luac$V
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+@@ -60,10 +60,10 @@ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ test:
+@@ -218,3 +218,30 @@ lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
+  lobject.h ltm.h lzio.h
+ 
+ # (end of Makefile)
++
++export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
++export LIB_VERSION = 6:1:1
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua$V.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
++
++gentoo_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
++
++gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/lua-5.1.5-r105.ebuild b/dev-lang/lua/lua-5.1.5-r105.ebuild
deleted file mode 100644
index 31cf0b445a0f..000000000000
--- a/dev-lang/lua/lua-5.1.5-r105.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline static"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	>=app-eselect/eselect-lua-3
-	!dev-lang/lua:0"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-make-r2.patch"
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-module_paths.patch"
-)
-
-src_prepare() {
-	default
-
-	# use glibtool on Darwin (versus Apple libtool)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
-			Makefile src/Makefile || die
-	fi
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
-	if ! use deprecated ; then
-		# patches from 5.1.4 still apply
-		eapply "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
-		eapply "${FILESDIR}"/${PN}-5.1.4-test.patch
-	fi
-
-	if ! use readline ; then
-		eapply "${FILESDIR}"/${PN}-$(ver_cut 1-2)-readline.patch
-	fi
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that this only affects the interpreter binary (named lua), not the lua
-	# compiler (built statically) nor the lua libraries (both shared and static
-	# are installed)
-	if use static ; then
-		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
-	fi
-
-	# A slotted Lua uses different directories for headers & names for
-	# libraries, and pkgconfig should reflect that.
-	sed -r -i \
-		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
-		-e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
-		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
-		"${S}"/etc/lua.pc
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# We want packages to find our things...
-	sed -i \
-		-e 's:/usr/local:'${EPREFIX}'/usr:' \
-		-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
-		etc/lua.pc src/luaconf.h || die
-}
-
-multilib_src_compile() {
-	tc-export CC
-	myflags=
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	if use readline; then
-		mylibs="-lreadline"
-	fi
-
-	cd src
-	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
-			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=$(ver_cut 1-2) \
-			gentoo_all
-
-	mv lua_test ../test/lua.static
-}
-
-multilib_src_install() {
-	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-			V=${SLOT} gentoo_install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	newins etc/lua.pc lua${SLOT}.pc
-}
-
-multilib_src_install_all() {
-	DOCS="HISTORY README"
-	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
-	einstalldocs
-	newman doc/lua.1 lua${SLOT}.1
-	newman doc/luac.1 luac${SLOT}.1
-}
-
-multilib_src_test() {
-	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
-	sort trace-calls trace-globals"
-	local negative="readonly"
-	local test
-
-	cd "${BUILD_DIR}" || die
-	for test in ${positive}; do
-		test/lua.static test/${test}.lua || die "test $test failed"
-	done
-
-	for test in ${negative}; do
-		test/lua.static test/${test}.lua && die "test $test failed"
-	done
-}
-
-pkg_postinst() {
-	eselect lua set --if-unset "${PN}${SLOT}"
-
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
-}
diff --git a/dev-lang/lua/lua-5.1.5-r106.ebuild b/dev-lang/lua/lua-5.1.5-r106.ebuild
new file mode 100644
index 000000000000..7ed88b370326
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.5-r106.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal portability toolchain-funcs
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+SRC_URI="https://www.lua.org/ftp/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline"
+
+COMMON_DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	!dev-lang/lua:0"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="sys-devel/libtool"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	PATCHES=(
+		"${FILESDIR}/lua-5.1.5-make.patch"
+		"${FILESDIR}/${PN}-$(ver_cut 1-2)-module_paths.patch"
+	)
+	if ! use deprecated ; then
+		# patches from 5.1.4 still apply
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-5.1.4-deprecated.patch
+			"${FILESDIR}"/${PN}-5.1.4-test.patch
+		)
+	fi
+	if ! use readline ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-$(ver_cut 1-2)-readline.patch
+		)
+	fi
+
+	default
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries.
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We want packages to find our things...
+	sed -i \
+		-e 's:/usr/local:'${EPREFIX}'/usr:' \
+		-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
+		etc/lua.pc src/luaconf.h || die
+}
+
+multilib_src_compile() {
+	tc-export CC
+	myflags=
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	if use readline; then
+		mylibs="-lreadline"
+	fi
+
+	cd src
+	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(ver_cut 1-2) \
+			gentoo_all
+
+	mv lua_test ../test/lua.static
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	newins etc/lua.pc lua${SLOT}.pc
+}
+
+multilib_src_install_all() {
+	DOCS="HISTORY README"
+	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
+	einstalldocs
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name 'liblua*.a' -delete || die
+}
+
+multilib_src_test() {
+	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
+	sort trace-calls trace-globals"
+	local negative="readonly"
+	local test
+
+	cd "${BUILD_DIR}" || die
+	for test in ${positive}; do
+		test/lua.static test/${test}.lua || die "test $test failed"
+	done
+
+	for test in ${negative}; do
+		test/lua.static test/${test}.lua && die "test $test failed"
+	done
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	if has_version "app-editor/emacs"; then
+		if ! has_version "app-emacs/lua-mode"; then
+			einfo "Install app-emacs/lua-mode for lua support for emacs"
+		fi
+	fi
+}
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 224f3123c8ac..3cd5a3b9c7d6 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated emacs readline static"
 
 RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-lang/lua/lua-5.1.5-r5.ebuild b/dev-lang/lua/lua-5.1.5-r5.ebuild
deleted file mode 100644
index bd982069373e..000000000000
--- a/dev-lang/lua/lua-5.1.5-r5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib multilib-minimal portability toolchain-funcs versionator flag-o-matic
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated emacs readline doc"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/luaconf.h
-)
-
-src_prepare() {
-	# Correct documentation link
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86.
-
-	# Therefore both lua interpreter and compiler are statically linked to
-	# the core library modules.
-
-	# Note: This patch only adds the required targets to the makefiles
-	# instead of relying upon libtool, which fails cross-compiling. Both
-	# shared and static versions of lua libraries are installed.
-	epatch "${FILESDIR}"/${P}-gentoo-build.patch
-
-	# Rename deprecated functions in scripts
-	use deprecated || epatch "${FILESDIR}"/${P}-disable-deprecated.patch
-
-	# Remove readline dependency if not requested
-	use readline || epatch "${FILESDIR}"/${P}-disable-readline.patch
-
-	epatch "${FILESDIR}/${P}-fix_vararg_calls.patch"
-
-	# Required by EAPI >= 6
-	eapply_user
-
-	# Add documentation URIs if needed
-	use doc && \
-		HTML_DOCS=( doc/*.{html,css,png,gif} ) && \
-		DOCS="HISTORY README"
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# Fix directories according to FHS/Gentoo policy paths and ABI
-	sed -i \
-		-e 's:/usr/local:'${EPREFIX}'/usr:' \
-		-e 's:/man/:/share/man/:' \
-		-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
-		Makefile etc/lua.pc src/luaconf.h doc/manual.html || die
-}
-
-multilib_src_compile() {
-	append-cflags "-DLUA_USE_LINUX"
-	append-ldflags "-Wl,-E"
-	tc-export AR CC CPP LD RANLIB
-	emake \
-		MYLDFLAGS="${LDFLAGS}" \
-		MYCFLAGS="${CFLAGS}" \
-		linux
-}
-
-multilib_src_install() {
-	emake -j1 install INSTALL_TOP="${ED}/usr"
-
-	insinto usr/$(get_libdir)/pkgconfig
-	doins etc/lua.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs -r
-
-	doicon etc/lua.ico
-
-	doman doc/lua.1 doc/luac.1
-}
-
-multilib_src_test() {
-	# These tests MUST succeed for the ebuild to succeed
-	local MUST_SUCCEED="bisect cf echo env factorial fib fibfor hello printf sieve
-	sort trace-calls trace-globals"
-
-	# These tests MUST fail for the ebuild to succeed
-	local MUST_FAIL="readonly"
-
-	cd "${BUILD_DIR}" || die
-
-	local test
-	for test in ${MUST_SUCCEED}; do
-		src/lua test/${test}.lua || die "test $test failed"
-	done
-
-	for test in ${MUST_FAIL}; do
-		src/lua test/${test}.lua && die "test $test failed"
-	done
-}
diff --git a/dev-lang/lua/lua-5.2.4-r2.ebuild b/dev-lang/lua/lua-5.2.4-r2.ebuild
deleted file mode 100644
index 79355e284ced..000000000000
--- a/dev-lang/lua/lua-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-TEST_PV="5.2.2" # no 5.2.3-specific release yet
-TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
-PKG_A="${P}.tar.gz"
-SRC_URI="
-	http://www.lua.org/ftp/${PKG_A}
-	test? ( https://www.lua.org/tests/${TEST_A} )"
-
-LICENSE="MIT"
-SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline static test test-complete"
-RESTRICT="!test? ( test )"
-
-RDEPEND="readline? ( sys-libs/readline:0= )
-	>=app-eselect/eselect-lua-3
-	!dev-lang/lua:0"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-make-r1.patch"
-)
-
-src_prepare() {
-	default
-
-	# use glibtool on Darwin (versus Apple libtool)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
-			Makefile src/Makefile || die
-	fi
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
-	if ! use readline ; then
-		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
-	fi
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that this only affects the interpreter binary (named lua), not the lua
-	# compiler (built statically) nor the lua libraries (both shared and static
-	# are installed)
-	if use static ; then
-		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
-	fi
-
-	# upstream does not use libtool, but we do (see bug #336167)
-	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
-	eautoreconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	sed -i \
-		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
-		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
-		src/luaconf.h \
-	|| die "failed patching luaconf.h"
-
-	econf
-}
-
-multilib_src_compile() {
-	tc-export CC
-
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	use readline && mylibs="-lreadline"
-
-	cd src
-
-	local myCFLAGS=""
-	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
-
-	case "${CHOST}" in
-		*-mingw*) : ;;
-		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
-	esac
-
-	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
-			SYSLDFLAGS="${LDFLAGS}" \
-			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=$(ver_cut 1-2) \
-			gentoo_all
-}
-
-multilib_src_install() {
-	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-			V=${SLOT} gentoo_install
-
-	case $SLOT in
-		0)
-			LIBNAME="lua"
-			INCLUDEDIR_SUFFIX=''
-			;;
-		*)	LIBNAME="lua${SLOT}"
-			INCLUDEDIR_SUFFIX="/lua${SLOT}"
-			;;
-	esac
-
-	# We want packages to find our things...
-	# A slotted Lua uses different directories for headers & names for
-	# libraries, and pkgconfig should reflect that.
-	local PATCH_PV=$(ver_cut 1-2)
-	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
-	sed -r -i \
-		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
-		-e "s:^prefix= :prefix= ${EPREFIX}:" \
-		-e "s:^V=.*:V= ${PATCH_PV}:" \
-		-e "s:^R=.*:R= ${PV}:" \
-		-e "s:/,lib,:/$(get_libdir):g" \
-		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
-		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
-		"${WORKDIR}/lua.pc" || die
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
-	# Copy Debian's symlink support:
-	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
-	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
-	# Older systems called it 'lua53.pc'
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
-	DOCS="README"
-	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
-	einstalldocs
-	newman doc/lua.1 lua${SLOT}.1
-	newman doc/luac.1 luac${SLOT}.1
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
-	# https://www.lua.org/tests/
-	# There are two sets:
-	# basic
-	# complete.
-	#
-	# The basic subset is selected by passing -e'_U=true'
-	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
-	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
-	use test-complete || TEST_OPTS="-e_U=true"
-	TEST_MARKER="${T}/test.failed"
-	rm -f "${TEST_MARKER}"
-
-	# If we are failing, set the marker file, and only check it after done all ABIs
-	abi_src_test() {
-		debug-print-function ${FUNCNAME} "$@"
-		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
-		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
-		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
-		return 0
-	}
-
-	multilib_foreach_abi abi_src_test
-
-	if [ -e "${TEST_MARKER}" ]; then
-		cat "${TEST_MARKER}"
-		die "Tests failed"
-	fi
-}
-
-pkg_postinst() {
-	eselect lua set --if-unset "${PN}${SLOT}"
-
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
-}
diff --git a/dev-lang/lua/lua-5.2.4-r3.ebuild b/dev-lang/lua/lua-5.2.4-r3.ebuild
new file mode 100644
index 000000000000..81b65efd45f7
--- /dev/null
+++ b/dev-lang/lua/lua-5.2.4-r3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib multilib-minimal portability toolchain-funcs
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+TEST_PV="5.2.2" # no 5.2.3-specific release yet
+TEST_P="${PN}-${TEST_PV}-tests"
+SRC_URI="
+	https://www.lua.org/ftp/${P}.tar.gz
+	test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="5.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline test test-complete"
+
+COMMON_DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:0= )
+	!dev-lang/lua:0"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="sys-devel/libtool"
+
+RESTRICT="!test? ( test )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}/lua-5.2.4-make.patch"
+)
+
+src_prepare() {
+	default
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries.
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(ver_cut 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	case $SLOT in
+		0)
+			LIBNAME="lua"
+			INCLUDEDIR_SUFFIX=''
+			;;
+		*)	LIBNAME="lua${SLOT}"
+			INCLUDEDIR_SUFFIX="/lua${SLOT}"
+			;;
+	esac
+
+	# We want packages to find our things...
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	local PATCH_PV=$(ver_cut 1-2)
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
+		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
+		"${WORKDIR}/lua.pc" || die
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+	# Copy Debian's symlink support:
+	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
+	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
+	# Older systems called it 'lua53.pc'
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
+}
+
+multilib_src_install_all() {
+	DOCS="README"
+	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
+	einstalldocs
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name 'liblua*.a' -delete || die
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	TEST_OPTS="$(usex test-complete '' '-e_U=true')"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	if has_version "app-editor/emacs"; then
+		if ! has_version "app-emacs/lua-mode"; then
+			einfo "Install app-emacs/lua-mode for lua support for emacs"
+		fi
+	fi
+}
diff --git a/dev-lang/lua/lua-5.3.6-r1.ebuild b/dev-lang/lua/lua-5.3.6-r1.ebuild
deleted file mode 100644
index f6968026e01c..000000000000
--- a/dev-lang/lua/lua-5.3.6-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-TEST_PV="5.3.4"
-TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
-PKG_A="${P}.tar.gz"
-SRC_URI="
-	http://www.lua.org/ftp/${PKG_A}
-	test? ( https://www.lua.org/tests/${TEST_A} )"
-
-LICENSE="MIT"
-SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline static test test-complete"
-RESTRICT="!test? ( test )"
-
-RDEPEND="readline? ( sys-libs/readline:0= )
-	>=app-eselect/eselect-lua-3
-	!dev-lang/lua:0"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-make-r1.patch"
-)
-
-src_prepare() {
-	default
-
-	# use glibtool on Darwin (versus Apple libtool)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
-			Makefile src/Makefile || die
-	fi
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
-	if ! use readline ; then
-		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
-	fi
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that this only affects the interpreter binary (named lua), not the lua
-	# compiler (built statically) nor the lua libraries (both shared and static
-	# are installed)
-	if use static ; then
-		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
-	fi
-
-	# upstream does not use libtool, but we do (see bug #336167)
-	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
-	eautoreconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	sed -i \
-		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
-		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
-		src/luaconf.h \
-	|| die "failed patching luaconf.h"
-
-	econf
-}
-
-multilib_src_compile() {
-	tc-export CC
-
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	use readline && mylibs="-lreadline"
-
-	cd src
-
-	local myCFLAGS=""
-	use deprecated && myCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
-
-	case "${CHOST}" in
-		*-mingw*) : ;;
-		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
-	esac
-
-	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
-			SYSLDFLAGS="${LDFLAGS}" \
-			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=$(ver_cut 1-2) \
-			gentoo_all
-}
-
-multilib_src_install() {
-	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-			V=${SLOT} gentoo_install
-
-	case $SLOT in
-		0)
-			LIBNAME="lua"
-			INCLUDEDIR_SUFFIX=''
-			;;
-		*)	LIBNAME="lua${SLOT}"
-			INCLUDEDIR_SUFFIX="/lua${SLOT}"
-			;;
-	esac
-
-	# We want packages to find our things...
-	# A slotted Lua uses different directories for headers & names for
-	# libraries, and pkgconfig should reflect that.
-	local PATCH_PV=$(ver_cut 1-2)
-	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
-	sed -r -i \
-		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
-		-e "s:^prefix= :prefix= ${EPREFIX}:" \
-		-e "s:^V=.*:V= ${PATCH_PV}:" \
-		-e "s:^R=.*:R= ${PV}:" \
-		-e "s:/,lib,:/$(get_libdir):g" \
-		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
-		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
-		"${WORKDIR}/lua.pc" || die
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
-	# Copy Debian's symlink support:
-	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
-	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
-	# Older systems called it 'lua53.pc'
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
-	DOCS="README"
-	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
-	einstalldocs
-	newman doc/lua.1 lua${SLOT}.1
-	newman doc/luac.1 luac${SLOT}.1
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
-	# https://www.lua.org/tests/
-	# There are two sets:
-	# basic
-	# complete.
-	#
-	# The basic subset is selected by passing -e'_U=true'
-	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
-	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
-	use test-complete || TEST_OPTS="-e_U=true"
-	TEST_MARKER="${T}/test.failed"
-	rm -f "${TEST_MARKER}"
-
-	# If we are failing, set the marker file, and only check it after done all ABIs
-	abi_src_test() {
-		debug-print-function ${FUNCNAME} "$@"
-		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
-		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
-		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
-		return 0
-	}
-
-	multilib_foreach_abi abi_src_test
-
-	if [ -e "${TEST_MARKER}" ]; then
-		cat "${TEST_MARKER}"
-		die "Tests failed"
-	fi
-}
-
-pkg_postinst() {
-	eselect lua set --if-unset "${PN}${SLOT}"
-
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
-}
diff --git a/dev-lang/lua/lua-5.3.6-r2.ebuild b/dev-lang/lua/lua-5.3.6-r2.ebuild
new file mode 100644
index 000000000000..78ce29e81b00
--- /dev/null
+++ b/dev-lang/lua/lua-5.3.6-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib multilib-minimal portability toolchain-funcs
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+TEST_PV="5.3.4"
+TEST_P="${PN}-${TEST_PV}-tests"
+SRC_URI="
+	https://www.lua.org/ftp/${P}.tar.gz
+	test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline test test-complete"
+
+COMMON_DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:0= )
+	!dev-lang/lua:0"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="sys-devel/libtool"
+
+RESTRICT="!test? ( test )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}/lua-5.3.6-make.patch"
+)
+
+src_prepare() {
+	default
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries.
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(ver_cut 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	case $SLOT in
+		0)
+			LIBNAME="lua"
+			INCLUDEDIR_SUFFIX=''
+			;;
+		*)	LIBNAME="lua${SLOT}"
+			INCLUDEDIR_SUFFIX="/lua${SLOT}"
+			;;
+	esac
+
+	# We want packages to find our things...
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	local PATCH_PV=$(ver_cut 1-2)
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
+		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
+		"${WORKDIR}/lua.pc" || die
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+	# Copy Debian's symlink support:
+	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
+	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
+	# Older systems called it 'lua53.pc'
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
+}
+
+multilib_src_install_all() {
+	DOCS="README"
+	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
+	einstalldocs
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name 'liblua*.a' -delete || die
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	TEST_OPTS="$(usex test-complete '' '-e_U=true')"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	if has_version "app-editor/emacs"; then
+		if ! has_version "app-emacs/lua-mode"; then
+			einfo "Install app-emacs/lua-mode for lua support for emacs"
+		fi
+	fi
+}
diff --git a/dev-lang/lua/lua-5.4.1-r1.ebuild b/dev-lang/lua/lua-5.4.1-r1.ebuild
deleted file mode 100644
index e21e767c10b0..000000000000
--- a/dev-lang/lua/lua-5.4.1-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-TEST_PV="5.4.1"
-TEST_P="${PN}-${TEST_PV}-tests"
-SRC_URI="
-	http://www.lua.org/ftp/${P}.tar.gz
-	test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="5.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline static test test-complete"
-
-COMMON_DEPEND="
-	>=app-eselect/eselect-lua-3
-	readline? ( sys-libs/readline:0= )
-	!dev-lang/lua:0"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-RESTRICT="!test? ( test )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/lua-5.4-makefiles.patch
-)
-
-src_prepare() {
-	default
-	# use glibtool on Darwin (versus Apple libtool)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
-			Makefile src/Makefile || die
-	fi
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that this only affects the interpreter binary (named lua), not the lua
-	# compiler (built statically) nor the lua libraries (both shared and static
-	# are installed)
-	if use static ; then
-		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
-	fi
-
-	# upstream does not use libtool, but we do (see bug #336167)
-	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
-	eautoreconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	sed -i \
-		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
-		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
-		src/luaconf.h \
-	|| die "failed patching luaconf.h"
-
-	econf
-}
-
-multilib_src_compile() {
-	tc-export CC
-
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	use readline && mylibs="-lreadline"
-
-	cd src
-
-	local myCFLAGS=""
-	use deprecated && myCFLAGS="-DLUA_COMPAT_5_3"
-	use readline && myCFLAGS="-DLUA_USE_READLINE"
-
-	case "${CHOST}" in
-		*-mingw*) : ;;
-		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
-	esac
-
-	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
-			SYSLDFLAGS="${LDFLAGS}" \
-			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=$(ver_cut 1-2) \
-			gentoo_all
-}
-
-multilib_src_install() {
-	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-			V=${SLOT} gentoo_install
-
-	case $SLOT in
-		0)
-			LIBNAME="lua"
-			INCLUDEDIR_SUFFIX=''
-			;;
-		*)	LIBNAME="lua${SLOT}"
-			INCLUDEDIR_SUFFIX="/lua${SLOT}"
-			;;
-	esac
-
-	# We want packages to find our things...
-	# A slotted Lua uses different directories for headers & names for
-	# libraries, and pkgconfig should reflect that.
-	local PATCH_PV=$(ver_cut 1-2)
-	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
-	sed -r -i \
-		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
-		-e "s:^prefix= :prefix= ${EPREFIX}:" \
-		-e "s:^V=.*:V= ${PATCH_PV}:" \
-		-e "s:^R=.*:R= ${PV}:" \
-		-e "s:/,lib,:/$(get_libdir):g" \
-		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
-		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
-		"${WORKDIR}/lua.pc" || die
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
-	# Copy Debian's symlink support:
-	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
-	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
-	# Older systems called it 'lua53.pc'
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
-	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
-	DOCS="README"
-	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
-	einstalldocs
-	newman doc/lua.1 lua${SLOT}.1
-	newman doc/luac.1 luac${SLOT}.1
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
-	# https://www.lua.org/tests/
-	# There are two sets:
-	# basic
-	# complete.
-	#
-	# The basic subset is selected by passing -e'_U=true'
-	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
-	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
-	TEST_OPTS="$(usex test-complete '' '-e_U=true')"
-	TEST_MARKER="${T}/test.failed"
-	rm -f "${TEST_MARKER}"
-
-	# If we are failing, set the marker file, and only check it after done all ABIs
-	abi_src_test() {
-		debug-print-function ${FUNCNAME} "$@"
-		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
-		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
-		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
-		return 0
-	}
-
-	multilib_foreach_abi abi_src_test
-
-	if [ -e "${TEST_MARKER}" ]; then
-		cat "${TEST_MARKER}"
-		die "Tests failed"
-	fi
-}
-
-pkg_postinst() {
-	eselect lua set --if-unset "${PN}${SLOT}"
-
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
-}
diff --git a/dev-lang/lua/lua-5.4.2-r1.ebuild b/dev-lang/lua/lua-5.4.2-r1.ebuild
new file mode 100644
index 000000000000..8f04e23301a7
--- /dev/null
+++ b/dev-lang/lua/lua-5.4.2-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib multilib-minimal portability toolchain-funcs
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+TEST_PV="5.4.2"
+TEST_P="${PN}-${TEST_PV}-tests"
+SRC_URI="
+	https://www.lua.org/ftp/${P}.tar.gz
+	test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="5.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline test test-complete"
+
+COMMON_DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:0= )
+	!dev-lang/lua:0"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="sys-devel/libtool"
+
+RESTRICT="!test? ( test )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/lua-5.4.2-make.patch
+)
+
+src_prepare() {
+	default
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries.
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS+="-DLUA_COMPAT_5_3 "
+	use readline && myCFLAGS+="-DLUA_USE_READLINE "
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+="-DLUA_USE_LINUX " ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(ver_cut 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	case $SLOT in
+		0)
+			LIBNAME="lua"
+			INCLUDEDIR_SUFFIX=''
+			;;
+		*)	LIBNAME="lua${SLOT}"
+			INCLUDEDIR_SUFFIX="/lua${SLOT}"
+			;;
+	esac
+
+	# We want packages to find our things...
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	local PATCH_PV=$(ver_cut 1-2)
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
+		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
+		"${WORKDIR}/lua.pc" || die
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+	# Copy Debian's symlink support:
+	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
+	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
+	# Older systems called it 'lua53.pc'
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
+}
+
+multilib_src_install_all() {
+	DOCS="README"
+	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
+	einstalldocs
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name 'liblua*.a' -delete || die
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	TEST_OPTS="$(usex test-complete '' '-e_U=true')"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	if has_version "app-editor/emacs"; then
+		if ! has_version "app-emacs/lua-mode"; then
+			einfo "Install app-emacs/lua-mode for lua support for emacs"
+		fi
+	fi
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index aae61005c157..bc74db5c6c8f 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -5,6 +5,7 @@ DIST MoarVM-2020.08.tar.gz 5333410 BLAKE2B 4590576148d26c96eda390c9b66966b102056
 DIST MoarVM-2020.09.tar.gz 5361349 BLAKE2B 4846f7b44a238f6f2b40e829999c4939cb6cd6988ff11ae68dd2381db3144f2c7b7ec37dd71fa6749b4a0147e20224a801342e3ea8bf03dbd758012723468861 SHA512 3859e96e6861dc7bf3f64708db33bb9a761b7a7bc3a05655424d6c27010cf6f01e73066e26bff7256f58ed4044f9aee2f186c886a419c3d6aff23f75102f6c48
 DIST MoarVM-2020.10.tar.gz 5362845 BLAKE2B 1486fbbe5407aaf010a2b929458750989820e62d9baadcf66ae97df55c93914639bc988ffe30055fee0a0b0f88f73d9de8d253e138b6d594581160d976831280 SHA512 5251d564909313ca7a660d462370e899d415cbd0b493da189abde952d80992c3e04525b2d8ae5066c9c4ea2c99860e38f9a8beaee4ea0d53d9b32973104fa7d3
 DIST MoarVM-2020.11.tar.gz 5402860 BLAKE2B f29ec4a8f4979fd65adb24cbfbbed586b69d47dd1176770e1e0e46a8bc35ef90146bae468fd6e088cd19201ba7e43d43d486d569970a81a695d6b642f57c2417 SHA512 c3ffe128db43316f93ad19f2804cd963cd2613dc46ffd29b099a165f122f6e7fdf28ce0b6c226a31f44abaeca72468f6774c39ceac3cea992596e8ce042ae7a5
+DIST MoarVM-2020.12.tar.gz 5429137 BLAKE2B dbf9b0b29226dde10b27ddb9195678c86efc77eff16b57745d31dbcef316c8ba4f5233e2c3672b436d089ce59d4ed9acc908e483d081768946c088708caf5711 SHA512 2e95a3336f0b5687f525a5117daf6cd62da6c59fd6d96d508637a30ca5a0bc7a86a35bb21f09f29068e2ec940b859944838eec4c4a2412a3f3bf8320c3d9cfd5
 EBUILD moarvm-2020.05.ebuild 1450 BLAKE2B 69eeacc8b1d00926b0091abca819dd1ddd0671b68932948229bb514e72d9162ddcd63caf60ad0ca04890a20f20c1a23f5e17c434c52f4905c9630b13013d9c8d SHA512 4c997a6e6ffcf5cc283a052c9f290d89792ddd4afd01da670d7f96f81d3b01ece1086a7586f8bf01b271e81bdb0dbc8d5718be8dab0472181f2bb1867d8e47d4
 EBUILD moarvm-2020.06.ebuild 1480 BLAKE2B cb4e8d2acb1a6f227e23be81e18b8085b6745bbe532878129f7a2f75a9ace9fe9f039bc9dbc80114b97fa91b44de5c6de52fbb63f1baeafb32f072b4ff1735ac SHA512 77513898ad1a24638b79fddc9d3b5439c7bdf809430cc355a1e0075111d2024e75935779f1daf878b41d717c3956ebcb52a8320c884939392c95f880ff9a6c00
 EBUILD moarvm-2020.07.ebuild 1480 BLAKE2B cb4e8d2acb1a6f227e23be81e18b8085b6745bbe532878129f7a2f75a9ace9fe9f039bc9dbc80114b97fa91b44de5c6de52fbb63f1baeafb32f072b4ff1735ac SHA512 77513898ad1a24638b79fddc9d3b5439c7bdf809430cc355a1e0075111d2024e75935779f1daf878b41d717c3956ebcb52a8320c884939392c95f880ff9a6c00
@@ -12,5 +13,6 @@ EBUILD moarvm-2020.08.ebuild 1480 BLAKE2B cb4e8d2acb1a6f227e23be81e18b8085b6745b
 EBUILD moarvm-2020.09.ebuild 1480 BLAKE2B cb4e8d2acb1a6f227e23be81e18b8085b6745bbe532878129f7a2f75a9ace9fe9f039bc9dbc80114b97fa91b44de5c6de52fbb63f1baeafb32f072b4ff1735ac SHA512 77513898ad1a24638b79fddc9d3b5439c7bdf809430cc355a1e0075111d2024e75935779f1daf878b41d717c3956ebcb52a8320c884939392c95f880ff9a6c00
 EBUILD moarvm-2020.10.ebuild 1480 BLAKE2B cb4e8d2acb1a6f227e23be81e18b8085b6745bbe532878129f7a2f75a9ace9fe9f039bc9dbc80114b97fa91b44de5c6de52fbb63f1baeafb32f072b4ff1735ac SHA512 77513898ad1a24638b79fddc9d3b5439c7bdf809430cc355a1e0075111d2024e75935779f1daf878b41d717c3956ebcb52a8320c884939392c95f880ff9a6c00
 EBUILD moarvm-2020.11.ebuild 1462 BLAKE2B edad2d56a35cbee9eed5d56be143c5adfcdccf0a3f8a79ccbb27a9cebaf13600d382e2ec33cbd6b9b6ca977da900e2534c07a6f9817289d37eee703a5a85933b SHA512 7dc335cdb837c879c5348a03b295ef02d2794cdbfb8b152536ec2c31e0504d476894d8a2b96fb60711d2595e011c198d928b53bea407edec356c69bc55066b7b
+EBUILD moarvm-2020.12.ebuild 1462 BLAKE2B edad2d56a35cbee9eed5d56be143c5adfcdccf0a3f8a79ccbb27a9cebaf13600d382e2ec33cbd6b9b6ca977da900e2534c07a6f9817289d37eee703a5a85933b SHA512 7dc335cdb837c879c5348a03b295ef02d2794cdbfb8b152536ec2c31e0504d476894d8a2b96fb60711d2595e011c198d928b53bea407edec356c69bc55066b7b
 EBUILD moarvm-9999.ebuild 1749 BLAKE2B 397154f5112030d9ee7a68a4334cec1d87df77b646da23ef92cfee881579aad59494d439beae2f0908159eb4fe20c1435e85815b87c71879c0ce1dccb800f0d1 SHA512 50a456d4e358784a13ffe62361c5394d946880b48d43d9acc8e5bc25d9d7f8a2795fabd49f15c057601433789438a4652bb616acb18c932dfff866be100887b2
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2020.12.ebuild b/dev-lang/moarvm/moarvm-2020.12.ebuild
new file mode 100644
index 000000000000..05561a98ca21
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2020.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		>=dev-libs/libuv-1.26
+		dev-libs/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	MAKEOPTS+=" NOISY=1"
+	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
+	local myconfigargs=(
+		"--prefix" "${prefix}"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir" "${libdir}"
+		"--compiler" "$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+
+	perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 7e8e94758baa..daea84696f5b 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,4 +1,4 @@
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
 DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
-EBUILD mujs-1.0.9.ebuild 1382 BLAKE2B 20eb932acd9e393a3180105580dedeb681e9f577ea7ffd2474909342fdadf22424b594ed72ffff16d1df303a467b6f25f43b8a699caac35c010f72109b5846dc SHA512 eb702eee9ff0a5e1036a72d02a4841b5fd7b5326788c75a6cb2456687aa1fe8334cca5f70eee806dc42affbd666722490b19339e54836634fdc1c78969c81d18
+EBUILD mujs-1.0.9.ebuild 1383 BLAKE2B 88db7edad27b1985bed99851a8cfe08cbca0634b6f3d438b75a5f57dc66aa1508351728840eaf9699563262c500bd10e3d09bd7f512f5cae0a35bedf08c98d05 SHA512 e76a7bd5725d1537cd0773b7c3d507b00727e8a2a0cf8a978d3dd702498536016f413c7e7aca8006395a360fbde00a3f4078228a288bd0352c94c173d80150b3
 MISC metadata.xml 547 BLAKE2B fcf818d9a103347b5b47f7b7c77654e84db6aa2a8dd12f169d58522cb47a455f02f0bf66fc85057a2a10916c4a24dcdca87a5f2e12c54d184ea8d5af1db65810 SHA512 e6bac32e74df77c2ded4e9a9e6200ab76e06217b9a236d6bf5f0df23a031eab2519f26e3d402ff106f9506a4dbe3baf66cae5f961f6d016e7c42fe83fc532799
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
index 5e989016cc43..befcb6751e4b 100644
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 # subslot matches SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 1022d15d16ea..cbbc5d2ab4cd 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -5,6 +5,7 @@ DIST nqp-2020.08.tar.gz 3951313 BLAKE2B 0eda6b50268cd4faf49a7311e4d94d9846e22307
 DIST nqp-2020.09.tar.gz 3951646 BLAKE2B 9ec1d121f9dc276ad52ea22d43fb24fefeda009f648b64f330669d7f9aaaef599522cca708b3671f982969cba0a1346cc078c55c98247545408b3a929899edd1 SHA512 dcebf63ea062c0fec95d701b1f20c492c845060599f4524fa87758ce5f8e52f6eae9a409c31b238783285f30a497acffd97242dc2ca7fbe4b8dd20291104b261
 DIST nqp-2020.10.tar.gz 3954398 BLAKE2B 5c44a20c3696bb596bd1d3088fba8db8c63ce6e612f00c2d24456dc7d908b12a214b4bde7e4e79505c39f6237a6f91578de47778185fa6cc3b6287c90e6c370e SHA512 279715fa0b2012852cc31b9e7898092510a1ba76005576a3ffe38f9dc8e9c002a4161be8f0b66e38c501e656a8124a320dbf2c90c89f53e57d0950e1baa1ea2b
 DIST nqp-2020.11.tar.gz 3954688 BLAKE2B d273c78c8f2083908b2815dc10787fec31404eb13c1e64253e7e5ae896d27a3755cf5c8045d47c4f465178568731e0d74951db6e45d103cf3ee18470124e97e0 SHA512 51b5e7f9d290bca7ada24cf9c12c61608be92269fc848976cada49f7445694e0f26929b5f9e90a9153eb379f0d74a6bb8068cd5ebf383d4501f75535b70e7605
+DIST nqp-2020.12.tar.gz 3957981 BLAKE2B d45ad66ebb0788db6e7191b4b7af4093b73e63e5f66ab4ccab62163b0285adb7d4e18a7c906c34f99dd63e0920f4d6e16e11005eb5df1d726796e9f106f9c4f8 SHA512 4ce87dc868c91565ebe896db766403bb018b2f5ea919bd0fb5b173498ba124712ffa795ec4e219240e5aabb59c55285bee5e46d3ac3d5869fc445b0ab3ea8485
 EBUILD nqp-2020.05.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 EBUILD nqp-2020.06.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 EBUILD nqp-2020.07.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
@@ -12,5 +13,6 @@ EBUILD nqp-2020.08.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef
 EBUILD nqp-2020.09.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 EBUILD nqp-2020.10.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 EBUILD nqp-2020.11.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
+EBUILD nqp-2020.12.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 EBUILD nqp-9999.ebuild 3647 BLAKE2B 8b111db7536fd66b1d2f495e3b55fd9b52f3339ef5af061423556de7c369a7d664f5a0a744371c1a6916140d3ed58103c1ca4b0859253c025d26f9379da69616 SHA512 27426a63f0b3838023af38543a580b83e66802790743f9fa4e5b6671ee86c4510ff9808686fa62a50d457b3d633a9ed5469948888078e0c48ceb1ca52a71b78e
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2020.12.ebuild b/dev-lang/nqp/nqp-2020.12.ebuild
new file mode 100644
index 000000000000..c41412d388c5
--- /dev/null
+++ b/dev-lang/nqp/nqp-2020.12.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.8 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.8 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=${EPREFIX}/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index e0cb393b8753..38d73edcded2 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -6,6 +6,7 @@ DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B 756936592c7e0c87da27f154f07850eb3e4b2ed
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
 DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B 71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d SHA512 f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
+DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
 DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4 SHA512 93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
 DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
@@ -13,5 +14,6 @@ EBUILD ocaml-4.04.2-r1.ebuild 3530 BLAKE2B 2030afbaad9ffbe4f34ce84c0215129f73873
 EBUILD ocaml-4.05.0-r1.ebuild 3685 BLAKE2B 9742c020d7b351f140b27976f55794aa134a8a8d0258ec1ce19b6db51a6bb162163ec33bf8ef4e5dff5239ce7edecffab37b4aae4c630f1a8216fcdc201481d3 SHA512 537cbf7ad8ed5aba17699a278970179af2a53a5fae4985e7999cee5be105110946907ec54da30b1dff2d5542258562dec9147f93c6b0f7c9599c9143f45c5fa4
 EBUILD ocaml-4.09.0.ebuild 2180 BLAKE2B ef0fd9648867c4f0140732f1d7faa8830f4a5f0a0cc4efe4c926d2436155a178763fde810a4b05d08bf4d1f8fcd029df8f650fd39d494ac2760cf5857cee63c0 SHA512 46156fb371611d94dc0de0a292915723fe64d3c9e3279ea79ea365b742cd2887b3426d2b6bca80722d9a3d8f964c5048f64054bdac25e5fdf156e818e47fdad9
 EBUILD ocaml-4.10.0.ebuild 2187 BLAKE2B 437c4eb045e9a96ca5f584b914eabd45a77d4d997c651c0a820fd3cf30b176191d964970ef0a2ffa98abb39219c097b77d2c9dfec04941c7f34fc7073707f5d1 SHA512 2af75c60c38970ca36d22d85f5512ec9b1f3683df5f2b500b595a7417984d937523e36ae56721452657ccf70b479541fe5e4197e7ba2aefead9b522746a31ca8
+EBUILD ocaml-4.10.2.ebuild 2138 BLAKE2B 512c5d9efda9204f9c93825fcc2be94c8cd513bb1ccea451e44de9f619b383d78f9f04966dd7975eaa271006438b5639bc55e1a8cf31806b6fc2f40fdcf28cd3 SHA512 8b46c5d29e9bba66588d005617d8a45c444f76d34b1140ba31b274c3b26ff1c2a453ab44b01644e7549f3536f2dfb534796db919d74e7ca74e904c4e520a4a8a
 EBUILD ocaml-4.11.1.ebuild 2009 BLAKE2B 95986d24d1e101ad19d3b8705eecb4954fd2b8f59d4db0e311df8f925ec9a8ff11cf1d610c3890bcdafa3954edf7628a54b2ddd348deb809521da4ffbb8c6982 SHA512 ae40fd641ba60b669af01c234a600c6412e266d209da282ebb3dccbd31ba5d08ce33a84243237646e103356f1c90c2d6b1c1225239bf9acc175706d33da4002e
 MISC metadata.xml 682 BLAKE2B b6f2326a10af3e782ff11f6f8a60a6a50cfe597a68616233def75a32996fcfa82955cae88be70ef946951d0958b4c735fbc50d7afa0c7f48b4ce9747b3afe0c7 SHA512 611d0608683b18a2c5ccde22cb982211f5d6ee9cd27d1a4674a55a8a059d549a5bff8e474b1f9d592236e64f9b32b4feb7dc29e921ccc65c49e857124df338c2
diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild b/dev-lang/ocaml/ocaml-4.10.2.ebuild
new file mode 100644
index 000000000000..509cb5812df2
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.10.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+	spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+	default
+	# Upstream build ignores LDFLAGS in several places.
+	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		Makefile.config.in || die "LDFLAGS fix failed"
+	# ${P} overrides upstream build's own P due to a wrong assignment operator.
+	sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
+}
+
+src_configure() {
+	local opt=(
+		--bindir="${EPREFIX}/usr/bin"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable flambda)
+		$(use_enable spacetime)
+	)
+	econf ${opt[@]}
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake world.opt
+	else
+		emake world
+	fi
+}
+
+src_test() {
+	if use ocamlopt ; then
+		# OCaml tests only work when run sequentially
+		emake -j1 -C testsuite all
+	else
+		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+	fi
+}
+
+src_install() {
+	default
+	dodir /usr/include
+
+	# Create symlink for header files
+	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+	dodoc Changes README.adoc
+
+	# Create envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+		doenvd "${T}/99ocamldoc"
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 23fae1fbb6ee..64b7f77a5a8d 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,4 +1,5 @@
 AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
+AUX perl-5.30.3-darwin-macos11.patch 6367 BLAKE2B 5fb6a34bf5e422ba4a5f76d9462328fb81e44e6de7dc363ad595d9315ac622d5eb2973700e3eb209f630bfd2d002adfe33f1a3a10f7c5818ed44fc3a26bd55d5 SHA512 c8d88c2f21b781e777ca19115eedecdf4d8bc0f93b01da6da578be489e0151f3ab7d3204e6b7a28848f9286bad90bcf6f33edc63be82949060e06fc6c739fb7f
 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
 DIST perl-5.30.3-patches-1.tar.xz 20292 BLAKE2B 34ca8dbdf08650deaaa59bba634c3a40c6da7d91b282365eec217cc421b17678837b1ae02de5d6b0b632858a0251b796ce28ddbdd7a86aca6697f18a527fcb62 SHA512 ba9aafcaff405c931b61ffc917be8ef71e538fd5277a3bcfafbaffc965b53f9c1811670558a0bc75c538586a30f11aba3ce59bd2214982eaad3b5afa64e67999
 DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
@@ -6,9 +7,8 @@ DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c
 DIST perl-5.32.0.tar.xz 12717336 BLAKE2B 4abad9f1ddabaad5f2bbfe8ab6d061aeb8c558e458d4bf1bcf737a8ecc1cf20f7dffaddd0bc867578b457787ec284fa81be3fae1edd7f72d58aeec7b5cd744e5 SHA512 1540247415893bbd94dfeede7b4fba6052688dc0bf27ced817f448246fcdc6e9a6486abc34577dec5b00bf02ed607b2d24ccd4977c3b3c51e8e6edfc0b81c760
 DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
 DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
-EBUILD perl-5.30.3-r1.ebuild 20519 BLAKE2B 73cd17c171cd276a3ed1397b11b08194b037cd8ed64c4c9786425e7e4b7ef1bac9d79d71ef87e8ce8cda5e783b46f97c83cc8b6e7644b175f1989e1e6573f559 SHA512 312e517ba15193952eb6f315c03401ae6dce5aef0b021ccd5ed087cfe12e59547c9290464440d57cfda5fafb49000e19a32cd7b2389e31ffef56c5ff5c048918
-EBUILD perl-5.30.3-r2.ebuild 25975 BLAKE2B f56945eadfa24535d9fd3cd1fd717fa3b1c569d0cdf40d2595b970912b584feb25affc0c104c691ee92184fc4f1b16a0bd6b3e45e3170c400f19fa8782110bec SHA512 d405ab9ea78a801fabc27693375d57551310baed120a2a4b5dce6554548ff91f7cb3d658d5ca29b35673a0639123ac30ffe1658919be657a3dbfcffa6b149eed
-EBUILD perl-5.30.3.ebuild 20230 BLAKE2B e3d024205657311a66da2b988a000d9ac4ca7aaf9b6002b65cbf1e580c7c893dad8accea58a56a7b1f883158d996c92ad1714e451bfc058ccbe15d06c7824cb8 SHA512 0c5ee31abdeb54e41dd12d8497bce14a8900654ae8de290d1aa9286807f16f9d010ee4d91add0e186a98ab3b14a07006932028572cc3dafe9a758b05bb1bc536
-EBUILD perl-5.32.0-r1.ebuild 25722 BLAKE2B d80f9e38f441af0034b580a5fc5ad05e098d84f2f8eaff2d71650ccf2ba2a1cf4b08728db075863b21f4a817ce47f1180d880251329dc79f4fc73eb9b506ec7c SHA512 68687199d717283e6773f080dc51fff10597bd584b75d3cb5030134811b355a37ce31cd92e3dd7a729d429891f9d7c7f6d2ffaaf58a62c31a8eebb641fd133c8
-EBUILD perl-5.32.0.ebuild 20238 BLAKE2B 5d3eb20950b80c7d0dd2a2aef97f4d9fd6a6aa7a73f3bdf571ef09982c19a1e6ee5ef7d474c61102211fe3094256268ae838c1f4ded248419c7e65d839552a75 SHA512 246656885ad38472e2896a858d555ef3baa3d7714d0f53bc099f588270670ce10e05f97cf110ccf7d17390039951dbb6c48c9c74eb9c4744e318c426cc96e57e
+EBUILD perl-5.30.3-r1.ebuild 20701 BLAKE2B 3b2838f4820eb7a2392b6133cc80cd2156a60efc4f0be44f6407b85675a892016887e669e5db0baaf94ad313df88d3a024b6e3cbc05b9b190362055d2d85279e SHA512 23b587f90ba53b94ef2d9ced14629f078a2af533cfa31ce0a4ea8bb9e21bac6d67b0ea749d76403535a3f1bbf97abd7354fe0168c5e3b839754044a42fec4814
+EBUILD perl-5.30.3-r2.ebuild 26157 BLAKE2B 618d5b97a8c2e8bf5cd144c09acf6e81d4103dd754e109abed1570df533eaa515f91671943c1f31b7962466bc4df69172de6db7971ca736a54ae31ea0d6e816c SHA512 09f96afba0fec83b2a396a79500e65a40d56198bbdbd6503dffaf423a0cf1fdb598741b9b199b2d7d72e94fd810938d772baf510d0efd2910f9b15bea3d4b4fc
+EBUILD perl-5.30.3.ebuild 20142 BLAKE2B a7313c61da3113e77bc6bfc600532142121af5bcf1d27383ca19efa60f05e172f68c87012f59f891fd6b19544999ec59bf063c42e2c95669b901a07cfa3fb061 SHA512 ca6c2fb8e66ef3bfa1124b4f6ce84bbb2f390b81ccbd2715bdaa5452781f8df8884407415a187748815132eb4c72ca4ee9df21a7a27712c290aa58d949634aec
+EBUILD perl-5.32.0-r1.ebuild 25924 BLAKE2B 5ee210b55f60b9e618acb2eeca4754126f763f541dfc1ed6911ab7045952bce37043fa56e29b229afe9f77a7e2edcc6c591fad4c38d0c2c1b2d2a241e0eaef71 SHA512 cdd4f11744192d3b226f9a789815236463d9ecfba1cacb14a5206d8c0357a91396d30dc695b02a2cb74b8e4076cb1e855721d6c4a23785055b36b7abd30deeba
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
new file mode 100644
index 000000000000..73879b398c4d
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
@@ -0,0 +1,180 @@
+https://github.com/Perl/perl5/pull/17946
+https://bugs.gentoo.org/757249
+---
+From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
+From: Adam Hartley <git@ahartley.com>
+Date: Mon, 6 Jul 2020 22:59:42 +0100
+Subject: [PATCH 1/7] Add 11.x support for darwin.sh
+
+---
+ hints/darwin.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 0a91bc083c0..c0f06de1cab 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
+    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
+    # capturing its value and adding it to the flags.
+     case "$MACOSX_DEPLOYMENT_TARGET" in
+-    10.*)
++    10.* | 11.*)
+       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
+       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
+       ;;
+@@ -327,7 +327,7 @@ EOM
+     # "ProductVersion:    10.11"     "10.11"
+         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+     case "$prodvers" in
+-    10.*)
++    10.* | 11.*)
+       add_macosx_version_min ccflags $prodvers
+       add_macosx_version_min ldflags $prodvers
+       ;;
+
+From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
+From: Adam Hartley <git@ahartley.com>
+Date: Wed, 8 Jul 2020 19:10:33 +0100
+Subject: [PATCH 3/7] Update error message
+
+---
+ hints/darwin.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index c0f06de1cab..988b766c4f4 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
+ 
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+ ***
+-*** Please either set it to 10.something, or to empty.
++*** Please either set it to 10.something, 11.something or to empty.
+ 
+ EOM
+       exit 1
+
+From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001
+From: Adam Hartley <git@ahartley.com>
+Date: Sat, 11 Jul 2020 11:41:27 +0100
+Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater
+
+---
+ hints/darwin.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 988b766c4f4..4f73a9995e7 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -342,11 +342,11 @@ EOM
+       exit 1
+     esac
+ 
+-    # The X in 10.X
++    prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
+     prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
+ 
+     # macOS (10.12) deprecated syscall().
+-    if [ "$prodvers_minor" -ge 12 ]; then
++    if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
+         d_syscall='undef'
+         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
+         case "$MACOSX_DEPLOYMENT_TARGET" in
+
+From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001
+From: Adam Hartley <BytesGuy@users.noreply.github.com>
+Date: Wed, 22 Jul 2020 13:15:30 +0100
+Subject: [PATCH 5/7] Simplify syscall check
+
+---
+ hints/darwin.sh | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 4f73a9995e7..40c84cf267a 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -342,11 +342,10 @@ EOM
+       exit 1
+     esac
+ 
+-    prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
+-    prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
++    darwin_major=$(echo $osvers|awk -F. '{print $1}')
+ 
+-    # macOS (10.12) deprecated syscall().
+-    if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
++    # macOS 10.12 (darwin 6.0.0) deprecated syscall().
++    if [ "$darwin_major" -ge 6 ]; then
+         d_syscall='undef'
+         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
+         case "$MACOSX_DEPLOYMENT_TARGET" in
+
+From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001
+From: Adam Hartley <BytesGuy@users.noreply.github.com>
+Date: Wed, 22 Jul 2020 13:15:53 +0100
+Subject: [PATCH 6/7] Update darwin.sh
+
+---
+ hints/darwin.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 40c84cf267a..1709d224f7c 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -344,8 +344,8 @@ EOM
+ 
+     darwin_major=$(echo $osvers|awk -F. '{print $1}')
+ 
+-    # macOS 10.12 (darwin 6.0.0) deprecated syscall().
+-    if [ "$darwin_major" -ge 6 ]; then
++    # macOS 10.12 (darwin 16.0.0) deprecated syscall().
++    if [ "$darwin_major" -ge 16 ]; then
+         d_syscall='undef'
+         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
+         case "$MACOSX_DEPLOYMENT_TARGET" in
+
+From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001
+From: Adam Hartley <BytesGuy@users.noreply.github.com>
+Date: Thu, 23 Jul 2020 19:53:07 +0100
+Subject: [PATCH 7/7] Future proof version check
+
+---
+ hints/darwin.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 1709d224f7c..fdfbdd4a3b9 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
+    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
+    # capturing its value and adding it to the flags.
+     case "$MACOSX_DEPLOYMENT_TARGET" in
+-    10.* | 11.*)
++    [1-9][0-9].*)
+       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
+       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
+       ;;
+@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
+ 
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+ ***
+-*** Please either set it to 10.something, 11.something or to empty.
++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
+ 
+ EOM
+       exit 1
+@@ -327,7 +327,7 @@ EOM
+     # "ProductVersion:    10.11"     "10.11"
+         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+     case "$prodvers" in
+-    10.* | 11.*)
++    [1-9][0-9].*)
+       add_macosx_version_min ccflags $prodvers
+       add_macosx_version_min ldflags $prodvers
+       ;;
diff --git a/dev-lang/perl/perl-5.30.3-r1.ebuild b/dev-lang/perl/perl-5.30.3-r1.ebuild
index b437e661e578..2e1c06f243cd 100644
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild
+++ b/dev-lang/perl/perl-5.30.3-r1.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads minimal"
@@ -140,8 +140,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@@ -342,6 +340,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# Upstreamed, but not in this version.
+		# Need to recognise macOS 11 / 10.16. #757249
+		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 
 	default
@@ -463,6 +465,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
 	# https://rt.perl.org/Public/Bug/Display.html?id=133803
@@ -478,7 +484,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
diff --git a/dev-lang/perl/perl-5.30.3-r2.ebuild b/dev-lang/perl/perl-5.30.3-r2.ebuild
index 6e6c7bf0efc9..8d2f9342210c 100644
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild
+++ b/dev-lang/perl/perl-5.30.3-r2.ebuild
@@ -53,7 +53,7 @@ if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
 # SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
 # FOR DETAILS
 KEYWORDS=""
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads"
@@ -142,8 +142,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@@ -424,6 +422,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# Upstreamed, but not in this version.
+		# Need to recognise macOS 11 / 10.16. #757249
+		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 
 	default
@@ -619,6 +621,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
 	# https://rt.perl.org/Public/Bug/Display.html?id=133803
@@ -634,7 +640,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
diff --git a/dev-lang/perl/perl-5.30.3.ebuild b/dev-lang/perl/perl-5.30.3.ebuild
index 792b17054133..eb0897300d18 100644
--- a/dev-lang/perl/perl-5.30.3.ebuild
+++ b/dev-lang/perl/perl-5.30.3.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads"
@@ -137,8 +137,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
diff --git a/dev-lang/perl/perl-5.32.0-r1.ebuild b/dev-lang/perl/perl-5.32.0-r1.ebuild
index 0c5fdc0e83d1..2fb82c29e11b 100644
--- a/dev-lang/perl/perl-5.32.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.32.0-r1.ebuild
@@ -17,6 +17,9 @@ DIST_AUTHOR=XSAWYERX
 # BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
 PERL_BIN_OLDVERSEN=""
 
+# Yes we can.
+PERL_SINGLE_SLOT=y
+
 if [[ "${PV##*.}" == "9999" ]]; then
 	DIST_VERSION=5.30.0
 else
@@ -52,8 +55,7 @@ SLOT="0/${SUBSLOT}"
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
 # SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
 # FOR DETAILS
-KEYWORDS=""
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads minimal"
@@ -145,8 +147,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@@ -427,6 +427,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# Upstreamed, but not in this version.
+		# Need to recognise macOS 11 / 10.16. #757249
+		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 
 	default
@@ -622,6 +626,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
 	# something compatible.
@@ -629,7 +637,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
diff --git a/dev-lang/perl/perl-5.32.0.ebuild b/dev-lang/perl/perl-5.32.0.ebuild
deleted file mode 100644
index b375dbc322bb..000000000000
--- a/dev-lang/perl/perl-5.32.0.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	mirror://gentoo/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.360.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.270.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.60.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.440.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.93.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.40.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.6.20    corelist
-	src_remove_dual      perl-core/Pod-Checker        1.730.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          1.690.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-interix*)   osname="interix" ;;
-		*-aix*)       osname="aix" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${MY_PV}"
-	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_update_patchlevel_h() {
-	# Copied and modified from debian:
-	# Copyright 2011 Niko Tyni
-	# This program is free software; you can redistribute it and/or modify
-	# it under the same terms as Perl itself.
-	local patchdir="${WORKDIR}/patches"
-	local prefix
-	local patchoutput="patchlevel-gentoo.h"
-
-	[[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
-	patchname=$(echo $patch | sed 's/\.diff$//')
-	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
-	# massage the patch headers
-	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
-	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
-	s|^Bug-Gentoo: ||; tprepend;
-	s/^\(Subject\|Description\): //; tappend;
-	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
-	# post-process at the end of input
-	$ { x;
-		# include the version number in the patchlevel.h description (if available)
-		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
-		# escape any backslashes and double quotes
-		s|\\|\\\\|g; s|"|\\"|g;
-
-		# add a prefix
-		s|^|\t,"'"$prefix$patchname"' - |;
-		# newlines away
-		s/\n/ /g; s/  */ /g;
-		# add a suffix
-		s/ *$/"/; p
-	};
-	# stop all processing
-	d;
-	# label: append to the hold space
-	:append H; d;
-	# label: prepend to the hold space
-	:prepend x; H; d;
-	'
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
-	local patch
-	EPATCH_OPTS+=" -p1"
-
-	if use hppa ; then
-		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
-	fi
-
-	einfo "Applying patches from ${PATCH_BASE} ..."
-	while read patch ; do
-		EPATCH_SINGLE_MSG="  ${patch} ..."
-		epatch "${WORKDIR}"/patches/${patch}
-	done < "${WORKDIR}"/patches/series
-
-	src_prepare_update_patchlevel_h
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$(
-			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
-				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
-				   -printf "%f "  2>/dev/null )"
-	fi
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$(
-		echo "${PERL_OLDVERSEN}"           |\
-			tr " " "\n" 				   |\
-			grep -vF "${DIST_VERSION%-RC}" |\
-			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
-	)"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$(
-				for v in ${PERL_OLDVERSEN};	do
-					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
-					echo -n "${v} ";
-				done )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		myconf -Dinc_version_list="${inclist}"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 55ff41b2db6f..2b4342db4e46 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,4 +1,4 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
-EBUILD python-exec-2.4.6-r2.ebuild 4141 BLAKE2B cfe0cd11ffdad126893a7a494ccaafb488b2a3a180c68d62520d7ae1bc5e221b4c401d187b86d8badb45c4e3f815db7c5412cc135af47f82b86ded40c20b755a SHA512 f60517b6f9515edb9336f8c2ec42872a26e68ba386b22abc5694172ccbdd11756946056ca45fcf3f610cb4cee24fa7b9d7be5dccf448ec751faa2e1650352283
-EBUILD python-exec-2.4.6-r3.ebuild 4214 BLAKE2B 7707317071781444f5cbfaa25a326db90ac92f1a74ba8c7753cd7e481246c86046ee93a41feab5c785a6801de87062a4c24d042c28ef8ef42bfbd4e36d9b6c62 SHA512 972f44f59e170bca6459cabaa8157f80978e7c46d00793adb65e5c293054c96c0bfb6f70ad2d6aef7de5065e33f18c996978c84bbab0a3a1d075f0e95d0f9b84
+EBUILD python-exec-2.4.6-r2.ebuild 4121 BLAKE2B b8ed4f42b9946870e3b51970368383e484c49a17d76b9f2acdffea3b0dd14e1a0f03ce3c6af07ab130469b3d0774c63550813cf0394240f61d15602adb8fd350 SHA512 820cbb693638a715eaf675c7e4006ad1e690009556e0e5c23f687945399b62000927d3a87458d8fac90b95cf0a924013f1ccc3f2785f5cb130a8ed80af5d185f
+EBUILD python-exec-2.4.6-r3.ebuild 4194 BLAKE2B 501bc6039f81bf638ff951c1a92c597d1a954d9797b5efa273fa8ccce5512331974255a00ac0cb0466c11b95a92634df22fc2db5040d2da00e4c6b83eab2d667 SHA512 274fc97253aaf333579eca8523661c65c6203f39f8b5837d280e6dd8ee9424da5b964fe5e9de1bf3f6b9d9b6f415eff28dbb1a5417bce9120f13f27b3ded2d81
 MISC metadata.xml 791 BLAKE2B ba836a4142e78972a7a6b603749bb4df0fe99cf0f054e286d9ede512db5cdab18f18fa484036e9ef7e19c20afcf1c94b70d0f813e7790dbd9decda996dd53713 SHA512 be18445f875537d03532d2ab30241951c2abc0929b382c351eda05003fd84cd84c545018941117bec5a2f74e2e2a1dd17b60bb2dae99eb81909826947ceabba9
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
index 3a975edc8d59..497ba1cfc01a 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
 
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild
index 6869fd24d057..ea92c192d98c 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index da63f21d558f..fb5e7f2e0e36 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,7 +1,6 @@
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
-DIST Python-3.10.0a1.tar.xz 18571152 BLAKE2B d74e467dfce1a0e3374377fc36865f1059e3810f67492608bbcfdb6880fc9a748ed19d1e3c4617a9218c842e8e9cb4119845eccb6848acae9b4af389cbbdb43a SHA512 eb1a0f6dd023efe67cfc2c833b0a7d390765d288e4da7aae932ba66b970d63ad377dbe48ddf0548c5cca5334a3aa1c7e92f972b68c54e4238ea1f3610adb8910
 DIST Python-3.10.0a3.tar.xz 18676916 BLAKE2B 86c8e3cd5d9658a2b1027558eda42294807173cac39010737dba6a0bf75a3a7211297cb79061085ab0cea52eaaba521140ff67c3b6edeebd677429191f4435b5 SHA512 a361c04081e9bd7e740c3311d92ec1428f12c589613ab39ed2bb1ac5aa20e4d8bc6d6e76eefc20edd459ecf8be1720f3985126be38407fcfb41f5a6efcea3998
 DIST Python-3.6.11.tar.xz 17213036 BLAKE2B 4dae9d9c5eb7e97a8990b0b5739d40ba8a85081c7e03adc22a3305e713d39b3a98ff66c17b395b9d45355e124307eed87803211378d14360e8b3455f7146a1ba SHA512 c76969a6602e095641ba5fd0999a47cf0187eb26559ba9a6e80fe401b8928f6cd9eabd963f615f7c667e48f56603f2508d2b5692c83ea8da1e21292131fb11d6
 DIST Python-3.6.12.tar.xz 17202980 BLAKE2B c8d22e4d57bcaffe77cd902cda3a473e73adf2b74ab104c23b4d846f19632a24cc0c478af84079b16d784bd1c0956824c06c1f6134fd24f54e58aaab0fe96bb6 SHA512 1462801f3f6626a853097d34ccdca9838c4c5bd81ecc3abc751003f5f2f8d36eecdaa4130ef4218de351c5586093c11669639a34492668fbc5a2a4a241f4a070
@@ -11,7 +10,6 @@ DIST Python-3.8.4.tar.xz 18020412 BLAKE2B cfcfb293c413b25fc3ca48116cf8ffaba7bee1
 DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
 DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
 DIST Python-3.8.7.tar.xz 18261096 BLAKE2B 6ac20efef41e828cb796aabcb7808400d494b9b48759950c8c15ee90762394f6763163d8e37ab407c1c79ebb9cda09189eaa969a75f96c86a96ccee962443924 SHA512 6a27d8eab3076930df46b0cf127f9b664f8d4147349b2b98132f464deb7f69d87e0167e8ee8e6c64249125ad73760d965ecbc81c252b63a1e7aac95594c62b74
-DIST Python-3.8.7rc1.tar.xz 18258688 BLAKE2B cd18abf3a2f97856581735fc6ab98882c3839edd84f736b2f681a227694319f410154201e5e09938ec45ba00b69a593737da22263560080da72625f8611f14c6 SHA512 0c42622433b968dc0943894bff6e90603bdfc4e49ab4373e2686a158e1d4b3450e60aa16d8203ce3d0e0e8bb0ebcaad281ccd7eb03b355eeeb7c811a4cd799ec
 DIST Python-3.9.0.tar.xz 18866140 BLAKE2B 8e12b64e187a65461473ac3b281dc489f0abac586e0755f6dbeceb236b34bdc008085eeac9ee1a19d76f5ec6a2fbda623985454c9d0164c4888a97b8cd940034 SHA512 b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e
 DIST Python-3.9.1.tar.xz 18897104 BLAKE2B bcbce176510e8e7c6ba6070588bedc52121c21c5271f59b3d629dfb542c51ee62622b2ca53a6e2041f1a51b2d089368cc4de9bb749e8ebad9a2c4eb4de83538e SHA512 b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019
 DIST python-gentoo-patches-2.7.18-r3.tar.xz 18856 BLAKE2B e35b3d847dad114057b7dab7615941b4879f3531aff1d23bced22da2d445cdec77cdd416566611ca01a3d39f30f16ef224f835f35ca12a301024d7a9fb6a507b SHA512 abb102223555535d5214fa91fd4bb3d1241050c86027af1612a9bd43fea2721e184587e5b784e5af9cbf563b8fec5a25cd07dc5fa72d762228734713176cfcbd
@@ -31,8 +29,7 @@ DIST python-gentoo-patches-3.9.0-r1.tar.xz 13728 BLAKE2B 50e85194c6bafefb8a0ddc4
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
 EBUILD python-2.7.18-r4.ebuild 10624 BLAKE2B 3981c0899d899e4dfbe198618e005bc9190af8cfbc6ca5b85911c717127bfa19ca546e0dcbf7b0317497e7f4d3fd8498e4b153f38468f31f83008c1f39da2067 SHA512 e3aee3d42db1539233a2a543818cd8a733dcb7c2a33a804d7f6b45cd1d087cd1e665e150ef308e61f49e969477fc1d3f8bd55ba5e9117a274e7e9645e65a3f3d
 EBUILD python-2.7.18-r5.ebuild 10627 BLAKE2B 1d50d2743f31982e24caa2107317883a1a2bd8f83201e7626aa09c744b5cd68436b22becffa1901753673622ab0967fd4d0954d99625571e651fb4e54f5e6aab SHA512 f6a4b0ee545be19fbceace65bfa5286fbca301c4744b923e6a969981d536b955a494bb71f6e9f271ff5dab9efd3cd95d2f48e5e99151c3601ba089f16c67b335
-EBUILD python-3.10.0_alpha1.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
-EBUILD python-3.10.0_alpha3.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
+EBUILD python-3.10.0_alpha3.ebuild 9628 BLAKE2B d4db8c51c51da54f03dceecc5a818efe94924477a163fe253b9368eca52cffbda09fe2506d63b743ba53c9214a2398e28684ce680213fc7c13cbbf8dd349bcf8 SHA512 c023dca89e22c57822f8f7186e5971cc6a1cefd553f9a2148db55e514064073e9a05300ee2b765ebc4ed877edf29ba8f3a51e03239404a90c74e0824d3f640bc
 EBUILD python-3.6.11-r2.ebuild 10610 BLAKE2B d9074e767b11ed420c843665b87c466f0014713221c0db4a026fbd91a39debc69689a1674db8a0c0b80dc3eb8df7bc86fe92972918f4c95ef8a52da2936bf631 SHA512 693795866815e724267877e4f97e14d09eda9f321b5c2b481f54952fcefc0859072ab42306eb03b81bd8b3e0a2d71435367452330caabf6bfebbcd2062d1ced0
 EBUILD python-3.6.12-r1.ebuild 10625 BLAKE2B 5ccce8aacd0eff19079975931a9e5bf0b53753ca75429a90e099dd0e42d9f390754541f1476d7ca26f2b7087c493a69af5eb450fc5c069a1cc37f8b270e438d0 SHA512 1c2a3dcdaacb23ef4227d8d3d212fb13065b1bf47e427e56d6da8fb8fe5c0e35f730a343f455ebf38b7535d412ca7f0b85a9a5d8426e52b54e1da83fbfdd3edd
 EBUILD python-3.6.12.ebuild 10607 BLAKE2B 8fb91060c126cce9d965ea75a5bdc0b8d107d55aeef37079bbd3b6537652ab769b38b8f037952bd160f602d3e206ce801eb3d2e8435bb222a2c36285619ddcac SHA512 85a15b371bab8ef783e48fa0a7780b5ac4b22ae05033b110957d072c5d5c326cc6faa2c5e2c6780b9da933a28dbd0eb4559f40cd10e82ddcc62e7344ccce1f02
@@ -44,7 +41,6 @@ EBUILD python-3.8.5.ebuild 10256 BLAKE2B 63447912d09c28b3774d717a82ac6e275197de6
 EBUILD python-3.8.6-r1.ebuild 10261 BLAKE2B 22fd9fa2595850cf8c7a0f3cf5e89b405c72f04f6e766d30204f6c7268682b5a69650216c4ed728b82afab68b1872e7df23a3f054f69390897bc78e0d2317bae SHA512 9d7f0eb2ce79592fd3121c82474d0b5669a430bd5c9ff32c8f0d3ad32f354a42045681e10b2aa379e5d55cfe098aa5e10e81b0b5b7747eab4df7f51648fa2ae2
 EBUILD python-3.8.6.ebuild 10257 BLAKE2B b118a84fd01fe4b410264840ff22e14996e96b61ce672a5856a21d31664f0caa89f03264c780665d3ba5e7922e3984e0df667667f346f3907e9e175622a118da SHA512 f8369eb3bf704366b187202b6f883ff8d5a9585b4a1aedf281c3e76f9d4009d169bfb62ccaa7489726ea8af692a7fbf1e79264f5bb4aa4339fad202ba6bffb79
 EBUILD python-3.8.7.ebuild 10264 BLAKE2B 539ee3af4b4820dd7677e351f16e50d706d6de8d45b7b48374653a024fa948f1945e97339bb7f961653c2d2ef52b5ba9216c86ef39cee9af16317535c298c515 SHA512 36e79faa5468446b33322c7a4bb1c4142307f51525690c3cdb99cfbefad362535c637635027af904215130c0ad6095cef27b600b9894cc4fc846bc93ee4603f2
-EBUILD python-3.8.7_rc1.ebuild 10276 BLAKE2B 5baaa0050d1c1fbbff68ff43f622a609678b40b7db953f7355edd5ffdbec38e1b6d922362ee6cd1c47cba9e050e94317417f8fd2e1b7d9394010f24c92d9e949 SHA512 cc84aa79891e1c0e26249f5c7bf7c63ccea625258ffff7d09e0d17404a866075ca0948fd910a9480f1c2447cb35cab090de2ccf26df63e3533b5680935bde771
 EBUILD python-3.9.0-r1.ebuild 9536 BLAKE2B 71ffd602605e2c311a97b842fa117974b89f29b625c22626eac0b2b650d2516022a749815bfecf486b62fdfb2737e0c21dbc95cde9680859ed96d2c02fa544b5 SHA512 5fab1557abcf3fd6ec2d5437f75f2a88e994ead37243bba40e00523ff91eefc44b2fde85b26ad39576992fcb9bb6368ed5051381e3768e295e261d50e7457f0e
 EBUILD python-3.9.0.ebuild 9533 BLAKE2B b4efc6b65f8fa865aa9f16484866b5f385a8c70e5276ee9e8c06772e16c23c8f9c058b4dfc891fd44daefd8d66a932155a02028bfeeaae283ba9d9a7bd9e3b0d SHA512 e21249bdd74e0304cf813f99a00dbc618dc8b5a358e0ca8547e631ff2a3d40cebe8c91313d07b3c992373b7cfb06fb00123016c5870d787bca14377cceff0ce5
 EBUILD python-3.9.1.ebuild 9542 BLAKE2B 7534f920099c3cfe5293ba093496a5858e4107f8e9e7f885c62a8d70e2c7ae4a0185b28d3753d07809b8bc99dc71ee7c4aef94880989ff43fc43fd77cbcae076 SHA512 f4fbf2530ea2c7c64d2aedaaa05890977d45709b5d6bfea2e8bf417996e59f6f8be41ac59b8811fc105b7c6f13ecb8b514fa7c4643a6871286f974190897db09
diff --git a/dev-lang/python/python-3.10.0_alpha1.ebuild b/dev-lang/python/python-3.10.0_alpha1.ebuild
deleted file mode 100644
index ea470a43ed9f..000000000000
--- a/dev-lang/python/python-3.10.0_alpha1.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV/_alpha/a}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.10.0a1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3.ebuild
index ea470a43ed9f..c26b80ae4526 100644
--- a/dev-lang/python/python-3.10.0_alpha3.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -53,7 +53,10 @@ RDEPEND="app-arch/bzip2:=
 # bluetooth requires headers from bluez
 DEPEND="${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.8.7_rc1.ebuild b/dev-lang/python/python-3.8.7_rc1.ebuild
deleted file mode 100644
index b60d4405e93e..000000000000
--- a/dev-lang/python/python-3.8.7_rc1.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV/_rc/rc}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.6"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 71e4cb15ba40..90cc1a1b9e21 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -6,6 +6,7 @@ DIST rakudo-2020.08.1.tar.gz 4740608 BLAKE2B be1b1f755690493483ba001407a89de69d6
 DIST rakudo-2020.09.tar.gz 4743378 BLAKE2B 4ccac6fa59ca80868e7525eabc05d358da9265a87aced24af2c25fae6c0e386aae18c5f44d9d3dd6db377f155b481e003c91c6e51bb6a89ee9a380e749e0c847 SHA512 c838b7a42670a99860184464b22b1cb3c9a27988eb6e982f4367df883afe06608199bf363164965c1199027eeed880f237771c1e8580a80e585f1fd67d0c0574
 DIST rakudo-2020.10.tar.gz 4755030 BLAKE2B 869f6dc6569093f7ad39d9c250d6564b6311cdefda2950784e54263bed6faca4b8653a9578b19f52819eb8e9f24e1f5f831468bf4620d885d4bb26944e22e8f4 SHA512 fcd00ac782ca28243ca2c6ceb45ff99322952086749aea01ccdfb5ae8c525cb6304fe5d20e7905a9808b1b7a1a96d7c4406847b10c0e4ea8b5fd7d053870f46a
 DIST rakudo-2020.11.tar.gz 5678270 BLAKE2B 314da91b516d509fcfcfff16e46444243083bdeb21294bc33a2996f1883317b663cc3442cbb6090c8339c5607b4e64a4c8c3c9f2fa5d728bd5c6513d6ef20bcf SHA512 d6c0f7849570b82611db311445f6b60000ecf1c0773d1bb5f4da0d27a9e0d443149ab72f954da2e75a8323d9be9c31f655dee1183a8ca714d89c63baa6e2489e
+DIST rakudo-2020.12.tar.gz 5690849 BLAKE2B 2f2bae068419279346d4dd49b734221d9a8bbeaac94b8fd44f03812ed33fbf8d4e096ba768388cb56571970d41f8ef319bf12d1f33a1cf36fe3ebb7ec6da40be SHA512 dfb94d1c8f75ec16e0149a37b57a9d9fc80ddaf256526edd3d3a23c0435881a187efbe88fd95a2174a9e9d93820987e561bb77745c7492e7ac50eb72879b4ab8
 EBUILD rakudo-2020.05.1.ebuild 1632 BLAKE2B 986fda7851e41d16434c112fd72056991cc07aaf18104918ae76bd81296866ce16af53a82e22db508f219de9aed5f2c32c7a71ba214d9931c1fa0839b0e054d6 SHA512 7d1f15d9fa94b666b6e4862905e2488ba1fcfcd5a8efd297aa8ceb388359036d329ba5d5bc5d4920094e6dabfa527ca11c5fbc08d556b2ec213bac7b6d648064
 EBUILD rakudo-2020.06.ebuild 1632 BLAKE2B e2bdaaf8c2c1dca93e6c9f5d7c6ff76f2681255d4c55ee60d2edb77833b29f1e2d2b0e947e139e28ba02acbaf35b95a7b99d183ec68d306998e72e49d7fdb6f3 SHA512 1cbf785efeaca5721fd547a1b953d665cf2dd28896324229d2a76252aa720831386a3c677414e81df530ea3ab8ea3e149d29461c668b999d255e845724b6774b
 EBUILD rakudo-2020.07.ebuild 1632 BLAKE2B e2bdaaf8c2c1dca93e6c9f5d7c6ff76f2681255d4c55ee60d2edb77833b29f1e2d2b0e947e139e28ba02acbaf35b95a7b99d183ec68d306998e72e49d7fdb6f3 SHA512 1cbf785efeaca5721fd547a1b953d665cf2dd28896324229d2a76252aa720831386a3c677414e81df530ea3ab8ea3e149d29461c668b999d255e845724b6774b
@@ -13,5 +14,6 @@ EBUILD rakudo-2020.08.1.ebuild 1632 BLAKE2B e2bdaaf8c2c1dca93e6c9f5d7c6ff76f2681
 EBUILD rakudo-2020.09.ebuild 1628 BLAKE2B 09151d187224cdf92865e57c775934cf952ea0b90462ac90c1e36a164dbd345d150e26a7cc3fd27796b61fbabb6b49f5025cff9d2271ad3ae03635c829d2baf8 SHA512 ec2242b1271167800bc954df2039f999981a1dff9bb0d0295d1b8fc780dbada59915e22ed50a5953d73fb65935e0090df6344255fbf5ba91f20e07139ceec082
 EBUILD rakudo-2020.10.ebuild 1628 BLAKE2B 09151d187224cdf92865e57c775934cf952ea0b90462ac90c1e36a164dbd345d150e26a7cc3fd27796b61fbabb6b49f5025cff9d2271ad3ae03635c829d2baf8 SHA512 ec2242b1271167800bc954df2039f999981a1dff9bb0d0295d1b8fc780dbada59915e22ed50a5953d73fb65935e0090df6344255fbf5ba91f20e07139ceec082
 EBUILD rakudo-2020.11.ebuild 1628 BLAKE2B 09151d187224cdf92865e57c775934cf952ea0b90462ac90c1e36a164dbd345d150e26a7cc3fd27796b61fbabb6b49f5025cff9d2271ad3ae03635c829d2baf8 SHA512 ec2242b1271167800bc954df2039f999981a1dff9bb0d0295d1b8fc780dbada59915e22ed50a5953d73fb65935e0090df6344255fbf5ba91f20e07139ceec082
+EBUILD rakudo-2020.12.ebuild 1628 BLAKE2B 09151d187224cdf92865e57c775934cf952ea0b90462ac90c1e36a164dbd345d150e26a7cc3fd27796b61fbabb6b49f5025cff9d2271ad3ae03635c829d2baf8 SHA512 ec2242b1271167800bc954df2039f999981a1dff9bb0d0295d1b8fc780dbada59915e22ed50a5953d73fb65935e0090df6344255fbf5ba91f20e07139ceec082
 EBUILD rakudo-9999.ebuild 1746 BLAKE2B 825811a2641e4fa2290771caf47ff2a5c4e6253455bb0b5fec85d1a910e952e597fca38f57aa6b939f4bb55aebbab14a30bad08bda8448d3dc3aa50dea81ccbd SHA512 af56d0da89afb6f506b6fd041692e1d798b7832d5684021aef6b9fd8d5d51336c4751e3cb9a6a906930f3ac115514098a83943cb0ee4a195f6fa5fc5027f7791
 MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a
diff --git a/dev-lang/rakudo/rakudo-2020.12.ebuild b/dev-lang/rakudo/rakudo-2020.12.ebuild
new file mode 100644
index 000000000000..e912ccc2de62
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2020.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1be5c16339e3..4cda8fdc98a1 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -13,11 +13,16 @@ AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819
 AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b
 AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
 AUX 2.7/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
+AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
+AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd
 DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed54d42cd79899b7d5cfe9dbc29ca708d12c630b3f52ff85b0c6a4011ae7ff0483d64b2fd445700a72a91028035 SHA512 2886be764a454425c5beef2777c64a70ee0d048b07896b327633d904f5077fea4299526689f9e2ac4dcd2fc4811cf9a6c8ce75367ed35d29dfe1a54222872e0d
 DIST ruby-2.6.6.tar.xz 11567284 BLAKE2B 45e910dd9b128c46bff3003834c4fdcbbc2e2e4d3e44f298ff4356a285de2c375d6b6021a3aa28d89336b32a1655fa4a7c086d07f4a0f6bcd578a11dd4a894da SHA512 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62
 DIST ruby-2.7.2.tar.xz 12037052 BLAKE2B a4ad22295b3fed4e8064fc6e77adb8642d1fa7ae1f4ef912d7bde19c735cb25b1a3e3aefba53dad944046d844d608bcefba61c314cf1e52747f50d7d91f4c436 SHA512 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
-EBUILD ruby-2.5.8-r1.ebuild 7100 BLAKE2B 912195706cc476e52dd0e20005d4a04a11b286312de1129a91e281e291fa3caeb7de083e296db8384de3816198f3c1c02168bfc09120628cef95cece93345ad8 SHA512 1f20bab421047c622053d7e07a873e1e8c35bac6b5d938ed1d72e33cf7f99be7ec1f300eac9da38651fcc7b3761a81140f630cf1039cde78c3858e2942e01728
+DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3dd5366a17da709a55797c798d099424a5628c78c842b825fb336c6a769ac9c371ef276f42bf3550fd0761ebe SHA512 2a23c2894e62e24bb20cec6b2a016b66d7df05083668726b6f70af8338211cfec417aa3624290d1f5ccd130f65ee7b52b5db7d428abc4a9460459c9a5dd1a450
+EBUILD ruby-2.5.8-r1.ebuild 7080 BLAKE2B 6745b85345bbc7223890e1062cdf330712f5373361cced82c85644ae51317f8109c7e54d4d7ceddeb9da3549295f6580ac390a53edda2e13ee696a78d9e0d5f4 SHA512 ef90164ac9c3afaea57ada4fd2aaa5140c5f8b3e7af5a5400d86c12c6cd40b10f26a4b05b11f13bfa525d16b45ed6328fcb71ed380b13aa05f4d17bcec59ee98
 EBUILD ruby-2.5.8.ebuild 6189 BLAKE2B aa04b9f393085468d3452bfcc55a45c721bcbe51c9602d6f44510d1f936369f1c741ade879d24c619b1722270a460ba20bc679f0714a98d310d8293bc84c3678 SHA512 156ac0da5b5e6d1240bcb42ad9a7ce455a17077a3bfd66610d5425216ff7436462e8e1362764c8614900376eef146b168e1dd4691cddd9f13ded5a4a30204c9e
-EBUILD ruby-2.6.6-r2.ebuild 7508 BLAKE2B 57e533cae47720895e1c5b09489df0895540cafe9b6601c2434f73de8fba58fefc24ccc3d9c60c0b729eafb0200e4e28657ad10f20c578c6fc6f2a67950fd99a SHA512 a4c5caf911449ca64d801de6e44c9431d7934f885905040a830b90fe7c87ee50c8cf1e8fc838ab50af6856ac96c9b85f4e251408ea7aeeb8ebd335708e7d17eb
-EBUILD ruby-2.7.2.ebuild 7679 BLAKE2B b4b0172836ea666a7e74d2cce467b7a19f449c702c49254a9a58f90925110207d9a9b183e285c63d8034eba931a30738fb935db129eece6ccafe1ff2615b4b73 SHA512 7dcac5ddecc5bd150a3b1c6a9ea29d34565fd242689c94d4101a5ff1e923f9917dc3ba0e8f32985092b21d067263f2cc08ca25d15808260c8100a9bffc76b29a
+EBUILD ruby-2.6.6-r2.ebuild 7488 BLAKE2B a193ab7f277a6f563ae8b1487f6d18162b3ee4ebadea77a7b84022852503bfdde73a9453f9c27464107949cdc04cc3853be06807031badf0f0d31e6d9930b38a SHA512 bf8215838e5c5e6623ccb3b6bfaf1342f394574624d73b02c1164ec05997979da8d41d59756a74319ffcf06677158d2e6ff58914b783d70011c735b89b78aeb8
+EBUILD ruby-2.7.2.ebuild 7659 BLAKE2B 4458dff235dcf5f779f54066213bc0160bedbc8428923075223ace92f77f6ddd8bac9e15121817625f6930ffc332e6f0acce1914d37ad0fbe199f288ae235b9e SHA512 21e41f9194ae0951733a8e6b440da23435348bb6d45637fb3e1b390b5450153d1123bcb5e0b9465d7de619837d113a22efe5c347f71e0298d5fd7ee1ab2fb9f1
+EBUILD ruby-3.0.0-r1.ebuild 7669 BLAKE2B fe414077b4789409c8b8e3175836804ab3a9ee817cadd5426fd9ba5b91ade187a9891275f36915db861d22f15a506571ebffab43d995fe282085667159744d8a SHA512 5447a9d010183029849789b4bd69d6e71f33f8989bc83bf6363d17b92c52fa4675ccdc86445324583bdd38e04086101e0158e3ad5b7a2e71bc0765d681f74dc3
+EBUILD ruby-3.0.0.ebuild 7663 BLAKE2B 6b01e3625ef1a76998c78fbc8ca29cd262805b2309d87c299c9e12cb1d7fc94611d728f2d2626270e859a7707170bb27663af8dd8525ab90b2bb90b7e283f28f SHA512 a520ec88ea2fdb24545db7eac512fa57e9b675268000cf7ef458d59300cf3282155b7865c3b946733f505a559f6c4a6f9d6ef7b675b972b14f37681eeec023e0
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/files/3.0/001-socksocket-fix.patch b/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
new file mode 100644
index 000000000000..1a79e25491cc
--- /dev/null
+++ b/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
@@ -0,0 +1,15 @@
+Fix compilation with socks5 USE flag.
+
+Patch by Phobos Kappa in https://bugs.gentoo.org/762253
+
+--- a/ext/socket/sockssocket.c	2020-12-25 05:33:01.000000000 +0200
++++ b/ext/socket/sockssocket.c	2020-12-28 15:42:50.310029778 +0200
+@@ -34,7 +34,7 @@
+ 	init = 1;
+     }
+ 
+-    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil);
++    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil);
+ }
+ 
+ #ifdef SOCKS5
diff --git a/dev-lang/ruby/files/3.0/010-default-gem-location.patch b/dev-lang/ruby/files/3.0/010-default-gem-location.patch
new file mode 100644
index 000000000000..060579b4f339
--- /dev/null
+++ b/dev-lang/ruby/files/3.0/010-default-gem-location.patch
@@ -0,0 +1,20 @@
+--- a/tool/rbinstall.rb.~1~	2020-12-25 04:33:01.000000000 +0100
++++ b/tool/rbinstall.rb	2020-12-25 10:05:34.629096405 +0100
+@@ -897,7 +897,7 @@
+ end
+ 
+ def install_default_gem(dir, srcdir)
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "default gems from #{dir}", gem_dir
+   makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+@@ -943,7 +943,7 @@
+ end
+ 
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "bundled gems", gem_dir
+   makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
diff --git a/dev-lang/ruby/ruby-2.5.8-r1.ebuild b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
index 6c1a64eaf332..7c067c811d1f 100644
--- a/dev-lang/ruby/ruby-2.5.8-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.6.6-r2.ebuild b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
index e8e8f2b88b64..bb80d67cf7d7 100644
--- a/dev-lang/ruby/ruby-2.6.6-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.7.2.ebuild b/dev-lang/ruby/ruby-2.7.2.ebuild
index 1afe088cc0ea..c57ee3e53e02 100644
--- a/dev-lang/ruby/ruby-2.7.2.ebuild
+++ b/dev-lang/ruby/ruby-2.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.0.0-r1.ebuild b/dev-lang/ruby/ruby-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..2ac7bec3231d
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.0.0-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
+	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
+	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
+	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
+	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
+	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
+	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby30]
+	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
+	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
+	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
+	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/{001,010}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.0.0.ebuild b/dev-lang/ruby/ruby-3.0.0.ebuild
new file mode 100644
index 000000000000..5c05821f92fb
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.0.0.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
+	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
+	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
+	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
+	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
+	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
+	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby30]
+	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
+	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
+	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
+	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index d21c188a81ff..690f8e01ad66 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -17,9 +17,9 @@ DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-03.tar.xz 3732 BLAKE2B 5dc47527581c010994a102e6458119c762ec3836f57e403cbaac88c457f5f119bd75ae1a067307b20d229536f75db4b2b797408874d28156667ac63b61de8501 SHA512 f0921562dcd0ea519bf3f5ef2da43f87565e92493781d56e6e0b73d4124f41e7aadd34d8285bbb181f4286160dde0c9684920e98058f0683143a2687eb93cc1a
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
-EBUILD spidermonkey-1.8.5-r9.ebuild 3995 BLAKE2B fb52ebb4287a3209ad318d8cd73687ddb6222e033b4b54311a99819805af89e095e3db95977713b54bb2adf694017fbc2e806760746d30df10a182860cd5e9f4 SHA512 faa9f16336a5326ee586f3d5b15fd92668d6fc22bf3e2342f5686157ca76afb4372e605248bd5cbfb09a5ed1b38a399725dda0bc321a98184593d43eac1613ca
-EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4591 BLAKE2B b8fe23279548903b66139d3310f041eb45f114c3012867cd01160155f6e8732e6d914a07346697d1a719439e351b891809bda603a842b8b220160d1d73db03ad SHA512 8f950866d7406a2a8626b2fd45a32cd89dfc4b4322c793cbfbab694ffc8eb7b752d032435302f1eae01d5e4882dca595e06b304ee1dc8b3fb095c1df88eb9287
-EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4238 BLAKE2B a5f3d1bcb0c12a678795d2e632822687e2d025bbb679daf0a5ffc2d262118bd5120f0a112ed39cf1feda178b609c6a2395e3d424c9e796b824a048bcb7385deb SHA512 3961fce1b9984e3929005a4d0ce3e0494ff1de7d42d07c70023b57d4e45f2d3cca1c6c8d8c803b95dcacf5a56ef9a66a339fe891bef594d079f275861d16b035
+EBUILD spidermonkey-1.8.5-r9.ebuild 3996 BLAKE2B da02b0abefceb6b31ca365a96f2154a5968ad697e509e46af5d4dbe2411ec36b31a5a159a7713ad4a87a666e1270b4a9ff3999d5d8c36d8997e76fa48748d428 SHA512 f8edcfa84f663224eab36544a42845267946f614da0bf787ec6c4d417992f2d29508df0166fd831a6a5809aae0921e0782e8fcc78cf8b925773b5bba3f2076d5
+EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4592 BLAKE2B 506e6a1958e0c4cd7f3898410efa2a5379fec57f6b758c44bdf1ebf7f015eed946ff8a5260db2a6a419047feecc320288a78c7daf9f9aa3083a98d332984e065 SHA512 939d5947a02a020992ef51449e12524ea19c7e2e875ccf1248008f1720c7bcc31fa907cd400487f762fd1eeb4d177b82b0656e3da4cf59d68ad5c2aa3065b02f
+EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4239 BLAKE2B 09f2cc1baada4607f23b71daecd974a450ea27e7ce3935018e16bbe0efd7ad4a1ee079b74b180b851923e0c56b7681064a02ae5026f85e05c5a402f477b5f705 SHA512 6e7b78828bc4c39f48112a1f7bc4d3efe30a5332506f10c7983f2492ef732cba7a57985b281b270721f67ad627b9fb19f8ec05ae2210b7018519b40d1a7e65a2
 EBUILD spidermonkey-68.12.0.ebuild 7310 BLAKE2B 9808f81f5adcd34331a2ae9db9c00303f13493e9a3dfdd007f89b8a87ce86c8626cd6041116ed0347f1675558363097c1d8727b36e92ed8dc76af2f2584a186d SHA512 c7ada8f749bf7fb5de92653730d54a1b1af32cce2486766606eae6cb3b592967c0fca37d43375250fa924ee9fdc275f923c0bd620cc25d21d51b8ba4be8587fc
 EBUILD spidermonkey-78.6.0.ebuild 12231 BLAKE2B 23f377bc3119c5c7597d792f47f4dbd12f069e35471b5f46391e8bd5f5cc173eb72c535daddd80cf0a264a2b101678c62ca3299946e38a8987b2cf9546af5582 SHA512 53731ca5668eb62120fabe901ab65d6d7cf337fcadea77e1e79b43d1fb8adbd669caf7514d028fbc55decb46291977c4553adcda8e0f68f7c628e11bce56860d
 MISC metadata.xml 868 BLAKE2B ee529f60bc83af6c54188ab4db2a1e05cbc3fcebf7732580cb5e507afada8560cb8812d4f155ae94c2ec87724bdfafe7312de86b47a95f599655695836c9b806 SHA512 caf3c383cd8109391cbf81baf5e942630bfd84ca6bc2a78430e58e5b0a40428e08b8a3d7c9fadccebaf94fe1aa673df837246fc32d5932b7f60dd43431ee1575
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
index de57154e617b..3808367d5171 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
 
 LICENSE="NPL-1.1"
 SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86 ~x64-macos"
 IUSE="debug minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
index 8ee26fbc1d3f..5b47c03a9c44 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.
 
 LICENSE="NPL-1.1"
 SLOT="52"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86"
 IUSE="debug minimal +system-icu test"
 
 # Disable tests:
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
index 264bc2a0d8d7..52f96f099364 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
 
 LICENSE="NPL-1.1"
 SLOT="60"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="debug +jit minimal +system-icu test"
 
 # Disable tests:
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 87de6e133a12..8dc1dd1a0750 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,7 +1,7 @@
 DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
 DIST swig-4.0.0.tar.gz 8052518 BLAKE2B a34eb17d795ba5b34ea7362f8f07d6a6e82fd4394a0159fcf608ffb27580f37fc722c4907f1fd6fa3322663662f8e11fecbcb2bc7b90405834ef35d6218d65c7 SHA512 c897b87fb8b21caf8d1bee2c39cb9675a3b0ee047110e808c310a2787f8b89585738726e9f517c64e9d2f1b8311136365c569528f399b444b1081f69689b7165
 DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
-EBUILD swig-3.0.12.ebuild 850 BLAKE2B 0bb048398af0fa3bc245ddbc84d239be3cbdb3573327a11bd1978dda689ce40c12ed9958995dbe60ceac50fca0c6f9db7749fbdbc83768fa6c652904551bb7d9 SHA512 f332940d4ce3c5579c6f1f471d10393b19224b620087081fde8d5802e87fc0fc34b44ea183934cdc155e32590316c5ddea0f49405505e630529021d41c8c3bf4
-EBUILD swig-4.0.0.ebuild 1081 BLAKE2B 12452e725eb9f122d486fb2cca0219aaf68b8dd23a16197c60dc46d9432392c1da37e670192a1864b8c81fdccec0c2e9965548c7754ff3051e134f7f2ceb2b6d SHA512 4c66772c92f1165fb1f747d7f9a59da00704503d914b2060f4d75d605a669567e215ec5b154b648423039f83c7e236a9ea013bc5968547fedfce48243daafb89
-EBUILD swig-4.0.2.ebuild 940 BLAKE2B 8a27ee8ca1ebd5885646735dd0128128167f40a2076e4ae0d822c3daf99eaefaa380d894a2b62ddf76de887ca6582741f6f04bdc3fe96d10c19e07d6f08a9ed5 SHA512 24870071b89f4c8b804348e091b4650c590a6c63a56088756fb4c53af5dee5381d301b1206c99dd7d28638c660da071383f3ad737c89c4b80cd2d3862b38dfbc
+EBUILD swig-3.0.12.ebuild 830 BLAKE2B 9fc30bc2f2d119e16612cfa8e4c021bc1adb6dbbc089acd21a8488a7be927509ca1ca44511d5a7c76ddf7d970ca629e03571657339b19d0ff8f7992c4508c66f SHA512 dbedea1c90eea2081f728abac5734ff62db277d33d814693263a393a5896b9d38003586002c9aec75c085ab6a28d2f48218477be302be1784f1cf34f14d1ad73
+EBUILD swig-4.0.0.ebuild 1061 BLAKE2B 758382719a4599e7d0244949c73928c4c219126c4ab40d3027b74e788fa19e1867b69285d3e8ef4c8dee2f20baa9666d65f96905bfac61e28459fd7dc8a0d9bf SHA512 f2e3cb316976fddffcb43cfa3650c9800e4c98b2e00646a35b92ed3bb1722cf46d6c0f0dcb5a4224e03515850f12110251dce32bb0b9c2ab2ed802c0ea349cb2
+EBUILD swig-4.0.2.ebuild 920 BLAKE2B 4af270d9c15303d93c64eaba5a9efd699f770530384d9ff365843759b554d1a81e7d86f6d3ba6a11c200823fd1a715ee20039942c4e6944f38cbe7dbe116e629 SHA512 c9604ba59bb0974f1f8437170be7c7837e2525266968b72684ccc05d7cd7de2249cb66b6ad568898be47c5419ca02e668520e96c87a8bf2822ba10f44c11fc6e
 MISC metadata.xml 1018 BLAKE2B c939a56a7dba17ea306dcbc20c63dac2e47addd3632b7493c46fc187b42d5e71a7c3bbf93d37c935c266eb28eaeaa3acf334a5996ed6419e9efe3d5cb9ce536a SHA512 1d24bf77a36660ca5a238f5059c42c942fe5abd795204bca65a8ecac0e98a6111a01d1ebc03224d265b454a76f76f49e991b1e2424de7f2095641ab1aa06c3fe
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
index 42a18fc9d57d..59641ef17860 100644
--- a/dev-lang/swig/swig-3.0.12.ebuild
+++ b/dev-lang/swig/swig-3.0.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/swig/swig-4.0.0.ebuild b/dev-lang/swig/swig-4.0.0.ebuild
index 3ded33ab9af7..b5b4755f26b6 100644
--- a/dev-lang/swig/swig-4.0.0.ebuild
+++ b/dev-lang/swig/swig-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/swig/swig-4.0.2.ebuild b/dev-lang/swig/swig-4.0.2.ebuild
index 021ea46fdb6c..87b349398382 100644
--- a/dev-lang/swig/swig-4.0.2.ebuild
+++ b/dev-lang/swig/swig-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 02ea5f2b0bda..99ec6eb0cb89 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,12 +1,15 @@
 AUX tcl-8.5.13-multilib.patch 258 BLAKE2B ca0453e8e0f6fdc1302f024ff81a8a6e012d0bfce592b990a349b10bed87d2adbb5dd0f68590373604327074d8da0bddeedb74549a5b33babaeba565838bf3f5 SHA512 7c5e06ba1028016abb6d1b3160834e311044c85db8ee1ba4f4b4d7a961096afeebff4164b276907de8b807ea8138225f1cad7641f2221284383aa31423353924
 AUX tcl-8.5.14-conf.patch 427 BLAKE2B c7d97bccebc45beec003bcf005fab6ed7f544744d81f08778a997b767ea0a60fd07f7b7cbc464ef8252e47717b34c0c42c871331a04740e23caeddbfb351de16 SHA512 e8097acb127966e6f2914c888278acdd9042d881b4d9436853ad7ed2361e8d67a372d4b0b0d5f0333e6bf90220e72df5c5eeffd4b44bc8e94ea9631ddc98cf16
+AUX tcl-8.6.10-multilib.patch 382 BLAKE2B 048865231ab45fefcd7bf708ba301809f358d7eddc45adc108c022768887ffb3e9912de9ab4ab4822453efe5c70a435ebcd61d7aedaf796b4b00b574ae6a318e SHA512 d0500d5dd7ae2f382221fd4f1a63d2ef689023b8873f6682f87b482ef601bd881a16321c02010067ae0a50e70ea75ccdb8b34753d809e9f7d591c279d344d6be
 AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8
 AUX tcl-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
 AUX tcl-8.6.9-include-spec.patch 488 BLAKE2B 06aa49163e8316b409238055d4b2ef67a3b37bdad69a190d39ce46a32dbd38320397b206036428c81e4a001ee0c01ee70f5970f584f919d0e5348000c7f93711 SHA512 ca4fc3ca2b3963d9c1b9b1c716e9c508d8c7aeaaad4b39c502472f3592c60907dbcda656369af371ec6c21f06a6dbc50fa02994a15284bedbdb22616ca9340ba
+DIST tcl-core8.6.10-src.tar.gz 6008840 BLAKE2B 592f708492e56da3577f190adc3da4f2979f32a570dfc29cb53fde58a83d804223dfe9527b76d094de3005a6e12dda73674573bab3af2e591b4573163b81b9c0 SHA512 de31ac8fc5226c831198af88befa05ccb1842dcfd209690e25b907f062033b3ae7a77bc12e85c4210ce85cfd7c598060e03fc81b0e624d422bfe4df655cc9068
 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69
 DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
-EBUILD tcl-8.5.17-r1.ebuild 3744 BLAKE2B 29003c3f0cfa65053f5d5cf1edc0efdb715999bd9fd7bac626ed1c48a5d509a9d4f92b638ba7d9b6641d60420c0811a0183fcf60845c9c382e7954b4ae0aff68 SHA512 c7e8b858cbd6aa63d018cf6e7806c166524b32e8fc57ec43688329e8c803546a084d265f681360afd31aa4eebb5e71b47d5459b8beb0f1a643b1dd5960d4320d
-EBUILD tcl-8.6.8.ebuild 3964 BLAKE2B d8c006d3404047dcb9f9ee120085bbe34889a5bf76dc38ba2ae511d353800ab06f93305d9f95426f3a4af2ab82dab2e15c25d95b81ed655a01790611496b1030 SHA512 715a16e0c5d846007e360fb67ed2168e5fa94411cd696c5ea55a59811499aefd3ec955406aba68447acb6f4f2ad4c64c9c80a80c77c92ae486356dbaab543a5e
-EBUILD tcl-8.6.9-r1.ebuild 3942 BLAKE2B fb6c064cd1b8ef6043f0da8a1b7efa28faee2718c2245a1259207b27eef127d420b1088d0be0d2089d78162478d555ee41ef663f5c435a379d0bdc1c34d2f8ee SHA512 9125bcb8a24b10be93422b89c8e174f42b4b3876d61dac9e144ea4f047d33165c3a81852aa23692333f0a752db7d08ef86fa182b32053a7591975fdae8056e9c
+EBUILD tcl-8.5.17-r1.ebuild 3733 BLAKE2B 90e3466a0eb63ad13b55aac70a668d15d48acf6676437e13aab653a6ce295c73dfeddfe5c62a8655c23a0c29951b3fc491a80e5c51d4db80ab9922bc443fffd6 SHA512 19386731323909977240149a7ba34d4c6d1c9f58a0b9a1f9a5ffcc16483bdba7969724b70dd6afd428ecab770f4a84d0a8a600657faaf4c63ec1f683ed7f74ca
+EBUILD tcl-8.6.10.ebuild 4041 BLAKE2B f558ab36454c4bff30bd1e5b53195670b20a2cb857d1dad7e5863fa76ca872fd5c462774b900167ad99aa70c77de873243d23edd3d29abd849c93359bbfad06f SHA512 38f19480fb2cd72b5ed2106c76131a33899b3fa3bbaa6f229d19ccac5d8c91e350e35a38b7cd8bcf49e87bf8f75f49670c9d642ee67710de8d7b998bff2fc099
+EBUILD tcl-8.6.8.ebuild 3953 BLAKE2B e053f5ff036f725430928745eccd4f62c65b5901ed10cabca42dd16d31ddbe624ad72dfd9b29bd8586eceaa6fc73441f40b0a0eb1f1b751915aa49dceb5ee932 SHA512 6756e79b284688a4aae6f06b1edf7bf04535042d60ef0ba6f9f31bf056d4f034b79615568c9d8fc12895a9f91e01749d965e68d464797498f7e0ad72a9575f3f
+EBUILD tcl-8.6.9-r1.ebuild 3931 BLAKE2B 2570a692bd16e933bca5c433154de9294104cac76367aa07d98c2489934d7e12faa3dec038b11bdb9b39d909a7435d7e53954857879eba2a02c1658650c3f6c6 SHA512 19618e0f243b66e88aefa388a8cc9d3a1b3f351cf1a8b930a2d71792f5260b364c8a30ef73e8ec9a3aac2555c19675b1759747049975566d2fc5b2501d5f1c9b
 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf
diff --git a/dev-lang/tcl/files/tcl-8.6.10-multilib.patch b/dev-lang/tcl/files/tcl-8.6.10-multilib.patch
new file mode 100644
index 000000000000..329d5614e782
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.6.10-multilib.patch
@@ -0,0 +1,11 @@
+--- a/unix/configure.in	2020-12-26 10:39:12.107965844 +0100
++++ b/unix/configure.in	2020-12-26 10:39:44.821378776 +0100
+@@ -773,7 +773,7 @@
+ 
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
diff --git a/dev-lang/tcl/tcl-8.5.17-r1.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
index c1959907d8b0..26e7a1b8dec1 100644
--- a/dev-lang/tcl/tcl-8.5.17-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.10.ebuild b/dev-lang/tcl/tcl-8.6.10.ebuild
new file mode 100644
index 000000000000..5a47c65e6fc8
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.6.10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+
+	# httpold tests require netowk
+	rm ../tests/httpold.test \
+		../tests/env.test \
+		../tests/http.test \
+		|| die
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ver_test 8.6 -lt ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, you must recompile the other"
+			ewarn "packages on your system that link with tcl after the upgrade"
+			ewarn "completes. To perform this action, please run revdep-rebuild"
+			ewarn "in package app-portage/gentoolkit."
+			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+			ewarn "upgrade them before this recompilation, too,"
+			echo
+		fi
+	done
+}
diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild
index 6cf0541e416e..693a6641ea88 100644
--- a/dev-lang/tcl/tcl-8.6.8.ebuild
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.9-r1.ebuild b/dev-lang/tcl/tcl-8.6.9-r1.ebuild
index 824abc3e73df..b176e16e454b 100644
--- a/dev-lang/tcl/tcl-8.6.9-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.6.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index ec403cf9618b..9f67686bf77b 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -2,14 +2,18 @@ AUX tk-8.4.15-aqua.patch 303 BLAKE2B 9030e6d84d769a2e2daadb4ed76de2b9ad8474016e8
 AUX tk-8.5.11-fedora-xft.patch 681 BLAKE2B b0f095f9a35eb134892c72e0c2adea97a9c3b91f984f1c8d92c15f51d39ec53c4255936f3627a93eb5fdbe0a5acc88f857e089ee566ba36c9dcaa3c10685c081 SHA512 14564e0d761187895a34d16f9f618514af76cac2ad51969d9eff4fafba44ad376c6adc0e27238c09ca708102d745a2965f7d2dc3c2f35acf4973199f0f9b40ef
 AUX tk-8.5.13-multilib.patch 453 BLAKE2B f7c8d90a3aa313e4ebaa6ca3b62a986637e424635a86957f92b594e80dc23dade699f53330f34c960f668d6878e64df239626f9983f90237e4275b3d352b55a6 SHA512 3fccbdea43b13977e04026f9db5a11c2be7d19062a9a008a09ece8e78f78983f79c1ea023562decd1e0a4fc0184045f2ea78da466bb9682f8a9bd214f5c2f4b1
 AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80fc9f31e16165c6f26db96a22ec5953840a316d430153e082e5dd6293edf8f899f0befe60d6e5b1b8ac2279 SHA512 31b53c31253df219d860fc9d067c53379bca571e799a2064e33fb1d9c3f228a001654438eeb5bad5315a6589e7b46f902d87cd54a52d4ed68c0d1d08f24ad544
+AUX tk-8.6.10-multilib.patch 404 BLAKE2B 64bead51acb308eb88147797288895cda5ea0f5165ccde7a4bb87eae18eb119a81acdea776f107dd6e6c7884a01485aeab897334d07c91d5a52c10257e9fb9cc SHA512 cb62e986bd98a0b8d9f780afc9906d6ee290e3e2381919364709161d90403e95937bc83e11d1e88b7826812ea60b41b54a0c8daa10cb17f1236cdd782a152beb
+AUX tk-8.6.10-test.patch 18201 BLAKE2B 305f761282b489ea462eb5cfecf1612770aa9a3b293149245f66b87e440f03fc167f3fa6de991330637951ec413906beaf6430c516431a5df1512e1307b80a99 SHA512 b3e20ba67412fed07bf47b2e2642e5962e082a78b66c2b2f058a31daf1ad757b6375e65be3e9afa374db731b28809780828be95b26cbde7873899979cf1c7f80
 AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70
 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
+DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
 DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
-EBUILD tk-8.5.17-r1.ebuild 3570 BLAKE2B 592beb2d2bdf69878aebe01c9ec0a98475546cc98f931ab52d763da051e7c9cf5407dc3b1fa89f859a4d1c4df8ff978c3f65006583e3c54ee8f2299e5175fe51 SHA512 49b6edbe7ef582fafab23bb003dad40875c5c9aab2f40ee824e686dc58b2f084610e07f23a30c9cf3c94351aa9a590c036b2e07075872a440fbefe3a1198d84b
-EBUILD tk-8.6.8.ebuild 4119 BLAKE2B 7245e2e32251ca52cf4d32f31a36709a143be170c28ef2344a73b19b01a44425beb49c68b46cdb623fe65ea9a553e95613571e5a1fe242ff1899c5e16c16ef40 SHA512 c95c03040595c8b8f32d29eb9c9af9816d960745cbcf75bd346e43e95ac7f9f28301ebad03b06bc3f5042c63bb00839387defdf9c2968c3ffa79351a5ce084a4
+EBUILD tk-8.5.17-r1.ebuild 3571 BLAKE2B 90b6735a4ff52357cd068f11db0abd34c95318873ce2095a2d6dc755220ec05277ab2178b723ca4415bb84913076bb8240a1c7147cb5856134771db900da32f5 SHA512 372562b78a672dd39eddd72f417b65b65c38b72871ca2fdf0ff716f02680bfa92a9549114846814dd9b6c5a4ee6cb2a6c1472b373a0cbe07c305e9b96adb07fb
+EBUILD tk-8.6.10.ebuild 4167 BLAKE2B 3c1d86d60f2e961d34edec18a25806f900e551e76530f9d4a94d952844bd690d79d3f24becfa4bfeb2cb17ebdda5f33a6c585a3f98123c9a4751017b46e3e58e SHA512 b91454c3107810ca9a7373e4835d957f9095586d154634d7a8c2599a2374e3af8622e7ba1529cf564ef50ad3a5d54e6389e2a7a8569b3ec769d96b74f19ef4d9
+EBUILD tk-8.6.8.ebuild 4120 BLAKE2B 470476cb0ede82c76db8be737a47692aec0f4f987e134a9ff011352007e647cfbd79d143c10db00b3867afe28882e60846d15fb26cd45c5231dcce585f520bf2 SHA512 0b338af999bc73e529caf31bcc3ca93ea99978a86b17731d5eb2e89c917c94af874bfb4bdc492d5eefcd368e2cb3e315be2be6fc5555995fd5855e7b55101101
 EBUILD tk-8.6.9.1.ebuild 4065 BLAKE2B bb860e975b826e176ce12a7b89ce8c7907d89680e57fe5070c5c2368b2e7e33306ef3bc52286f0598d66d1131cb9828ba774dd8128ef4c578139cd7ae043014e SHA512 d679dcde39d13c1b7529d8f8bd16944b402945a4927c9d19048c59a9f64b6dd4c444a864d4a00bc1a8cfd604211e5402824114b85a15587945c2cb308f661f8c
 EBUILD tk-8.6.9.ebuild 4031 BLAKE2B 845baf6bf3cda8b416458f8bce71ef8ed054be17ed409a0647264ccab51c1493e4521cbfa6c436efecbae593adaf30161c00537294104054504242616e6f5dd1 SHA512 c8b4e08f10259be8da527ff1b7e8597ab28ab75d3ba7d04f4434820f7cb0429a1044a68e4b8f5670c6ecf486ca341e417e9d7735c29d2e73684e14fa1e7f9509
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/files/tk-8.6.10-multilib.patch b/dev-lang/tk/files/tk-8.6.10-multilib.patch
new file mode 100644
index 000000000000..9b781362d65f
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.10-multilib.patch
@@ -0,0 +1,11 @@
+--- a/unix/configure.in	2020-12-26 11:26:32.952828258 +0100
++++ b/unix/configure.in	2020-12-26 11:26:45.027642732 +0100
+@@ -663,7 +663,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
diff --git a/dev-lang/tk/files/tk-8.6.10-test.patch b/dev-lang/tk/files/tk-8.6.10-test.patch
new file mode 100644
index 000000000000..89dcbabfbdc0
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.10-test.patch
@@ -0,0 +1,527 @@
+--- a/tests/ttk/entry.test	2020-12-26 18:46:45.262306641 +0100
++++ b/tests/ttk/entry.test	2020-12-26 18:47:00.246040124 +0100
+@@ -111,34 +111,34 @@
+     set result [.e xview]
+ } -result {0.0 0.5}
+ 
+-test entry-3.3 "xview" -body {
++test entry-3.3 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview end
+     set result [.e index @0]
+ } -result {7}
+ 
+-test entry-3.4 "xview" -body {
++test entry-3.4 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview moveto 1.0
+     set result [.e index @0]
+ } -result {7}
+ 
+-test entry-3.5 "xview" -body {
++test entry-3.5 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview scroll 5 units
+     set result [.e index @0]
+ } -result {5}
+ 
+-test entry-3.6 "xview" -body {
++test entry-3.6 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
+     .e xview scroll 2 pages
+     set result [.e index @0]
+ } -result {40}
+ 
+ test entry-3.last "Series 3 cleanup" -body {
+     destroy .e
+ }
+--- a/tests/bind.test	2020-12-26 18:48:21.586593331 +0100
++++ b/tests/bind.test	2020-12-26 18:48:50.134085486 +0100
+@@ -639,7 +639,7 @@
+ } -cleanup {
+     destroy .t.f
+ } -result {Keycolon Releasecolon}
+-test bind-13.14 {Tk_BindEvent procedure: invalid key detail} -setup {
++test bind-13.14 {Tk_BindEvent procedure: invalid key detail} -constraints knownBug -setup {
+     frame .t.f -class Test -width 150 -height 100
+     pack .t.f
+     focus -force .t.f
+@@ -3536,7 +3536,7 @@
+     destroy .t.f
+ } -returnCodes error -result {bad window name/identifier "xyz"}
+ 
+-test bind-22.66 {HandleEventGenerate: options <Key> -root [winfo id .t]} -setup {
++test bind-22.66 {HandleEventGenerate: options <Key> -root [winfo id .t]} -constraints knownBug -setup {
+     frame .t.f -class Test -width 150 -height 100
+     pack .t.f
+     focus -force .t.f
+--- a/tests/ttk/spinbox.test	2020-12-26 18:49:19.967554727 +0100
++++ b/tests/ttk/spinbox.test	2020-12-26 18:49:58.015877788 +0100
+@@ -136,7 +136,7 @@
+     destroy .sb
+ } -returnCodes error -result {bad validate "bogus": must be all, key, focus, focusin, focusout, or none}
+ 
+-test spinbox-1.8.4 "-validate option: " -setup {
++test spinbox-1.8.4 "-validate option: " -constraints knownBug -setup {
+     set ::spinbox_test {}
+     ttk::spinbox .sb -from 0 -to 100
+ } -body {
+--- a/tests/canvText.test	2020-12-26 18:57:00.520357006 +0100
++++ b/tests/canvText.test	2020-12-26 19:02:44.545236036 +0100
+@@ -921,7 +921,7 @@
+     destroy .c
+ } -result {{Yeah } Yeah- 4 4}
+ 
+-test canvText-20.1 {angled text bounding box} -setup {
++test canvText-20.1 {angled text bounding box} -constraints knownBug -setup {
+     destroy .c
+     canvas .c
+     proc transpose {bbox} {
+--- a/tests/focus.test	2020-12-26 19:03:59.769904923 +0100
++++ b/tests/focus.test	2020-12-26 19:11:21.583080155 +0100
+@@ -73,7 +73,7 @@
+ }
+ 
+ 
+-test focus-1.1 {Tk_FocusCmd procedure} -constraints unix -body {
++test focus-1.1 {Tk_FocusCmd procedure} -constraints knownBug -body {
+     focusClear
+     focus
+ } -result {}
+@@ -83,7 +83,7 @@
+     focus .alt.b
+     focus
+ } -result {}
+-test focus-1.3 {Tk_FocusCmd procedure} -constraints unix -body {
++test focus-1.3 {Tk_FocusCmd procedure} -constraints knownBug -body {
+     focusClear
+     focus .t.b3
+     focus
+@@ -145,7 +145,7 @@
+     focus -displayof .lousy
+ } -returnCodes error -result {bad window path name ".lousy"}
+ test focus-1.12 {Tk_FocusCmd procedure, -displayof option} -constraints {
+-	unix 
++	knownBug 
+ } -body {
+     focusClear
+     focus .t
+@@ -308,7 +308,7 @@
+ } .t.b1}
+ 
+ test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     focus .t.b1
+     focus .
+@@ -320,7 +320,7 @@
+     list $x $focusInfo
+ } -result {.t.b1 {press .t.b1 x}}
+ test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     set result {}
+     foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear
+@@ -341,7 +341,7 @@
+     focus
+ } -result {.t.b1}
+ test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     focus .t.b1
+     event gen [testwrapper .] <FocusOut> -detail NotifyAncestor
+@@ -348,7 +348,7 @@
+     focus
+ } -result {}
+ test focus-2.10 {TkFocusFilterEvent procedure, Enter events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     set result {}
+     focus .t.b1
+@@ -410,7 +410,7 @@
+     destroy .t2
+ } -result {}
+ test focus-2.15 {TkFocusFilterEvent procedure, Leave events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     set result {}
+     focus .t.b1
+@@ -426,7 +426,7 @@
+     return $result
+ } -result {{} .t.b1 {} {} {}}
+ test focus-2.16 {TkFocusFilterEvent procedure, Leave events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     focusClear
+     focus .t.b1
+@@ -440,7 +440,7 @@
+ out .t NotifyVirtual
+ }
+ test focus-2.17 {TkFocusFilterEvent procedure, Leave events} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     focusClear
+     focus .t.b1
+@@ -508,7 +508,7 @@
+     destroy .t2
+ } -result {}
+ test focus-3.5 {SetFocus procedure, generating events} -constraints {
+-	unix testwrapper
++    knownBug
+ } -body {
+     focusSetup
+     focusClear
+@@ -548,7 +548,7 @@
+ 
+ 
+ test focus-4.1 {TkFocusDeadWindow procedure} -constraints {
+-	unix testwrapper
++	knownBug
+ } -body {
+     focusSetup
+     update
+@@ -599,7 +599,7 @@
+ 
+ # Test 5.1 fails (before and after update)
+ test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} -constraints {
+-    unix testwrapper secureserver
++    knownBug
+ } -body {
+     setupbg
+     focusSetup
+@@ -622,7 +622,7 @@
+ 
+ fixfocus
+ test focus-6.1 {miscellaneous - embedded application in same process} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -setup {
+     eval interp delete [interp slaves]
+ } -body {
+@@ -677,7 +677,7 @@
+ } -result {{.t.f2.e1 {} {focus out .t.f2.e1 NotifyNonlinear} {focus out .t.f2 NotifyNonlinearVirtual} {focus in .t.f1 NotifyNonlinear} | {focus out .t.f1 NotifyNonlinear} {focus in .t.f2 NotifyNonlinearVirtual} {focus in .t.f2.e1 NotifyNonlinear}} {{focus in . NotifyVirtual} {focus in .e1 NotifyAncestor} | {focus out .e1 NotifyAncestor} {focus out . NotifyVirtual}}}
+ 
+ test focus-6.2 {miscellaneous - embedded application in different process} -constraints {
+-    unix  testwrapper
++    knownBug
+ } -body {
+     setupbg
+     toplevel .t
+--- a/tests/font.test	2020-12-26 19:15:55.199228774 +0100
++++ b/tests/font.test	2020-12-26 19:18:05.414951407 +0100
+@@ -134,7 +134,7 @@
+     # not (objc > 3) so objPtr = NULL
+     lindex [font actual {-family times}] 0
+ } -result {-family}
+-test font-4.9 {font command: actual} -constraints {unix noExceed} -body {
++test font-4.9 {font command: actual} -constraints {knownBug} -body {
+     # (objc > 3) so objPtr = objv[3 + skip]
+     string tolower [font actual {-family times} -family]
+ } -result {times}
+@@ -399,7 +399,7 @@
+     # (tkfont == NULL)
+     font measure "\{xyz" abc
+ } -returnCodes error -result "font \"{xyz\" doesn't exist"
+-test font-9.5 {font command: measure} -body {
++test font-9.5 {font command: measure} -constraints knownBug -body {
+     # Tk_TextWidth()
+     expr {[font measure $fixed "abcdefg"] == [font measure $fixed "a"]*7 }
+ } -result 1
+@@ -450,7 +450,7 @@
+     # (Tcl_GetIndexFromObj() != TCL_OK)
+     font metrics $fixed -xyz
+ } -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}
+-test font-10.9 {font command: metrics: get individual metrics} -body {
++test font-10.9 {font command: metrics: get individual metrics} -constraints knownBug -body {
+     font metrics $fixed -ascent
+     font metrics $fixed -descent
+     font metrics $fixed -linespace
+@@ -921,7 +921,7 @@
+     }
+ } -result {LucidaBright}
+ test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
+-	x11
++	knownBug
+ } -body {
+     psfontname "{new century schoolbook} 10"
+ } -result {NewCenturySchlbk-Roman}
+--- a/tests/main.test.old	2020-12-26 19:27:49.188791206 +0100
++++ b/tests/main.test	2020-12-26 19:28:40.782897366 +0100
+@@ -91,7 +91,7 @@
+ 	removeFile script
+ } -returnCodes ok -result {-enc utf-8 script}
+ 
+-test main-3.1 {Tk_ParseArgv: -help option} -constraints unix -body {
++test main-3.1 {Tk_ParseArgv: -help option} -constraints knownBug -body {
+     # Run only on unix as Win32 pops up native dialog
+     exec [interpreter] -help
+ } -returnCodes error -match glob -result {% application-specific initialization failed: Command-specific options:*}
+--- a/tests/pack.test	2020-12-26 19:29:47.742736743 +0100
++++ b/tests/pack.test	2020-12-26 19:30:50.867642152 +0100
+@@ -1551,7 +1551,7 @@
+ 
+ 
+ test pack-18.1 {unmap slaves when master unmapped} -constraints {
+-    tempNotPc
++    knownBug
+ } -setup {
+     eval destroy [winfo child .pack]
+ } -body {
+@@ -1575,7 +1575,7 @@
+     update
+     lappend result [winfo ismapped .pack.a]
+ } -result {1 0 200 75 0 1}
+-test pack-18.2 {unmap slaves when master unmapped} -setup {
++test pack-18.2 {unmap slaves when master unmapped} -constraints knownBug -setup {
+     eval destroy [winfo child .pack]
+ } -body {
+ 
+--- a/tests/place.test	2020-12-26 20:20:26.508256229 +0100
++++ b/tests/place.test	2020-12-26 20:21:00.213678014 +0100
+@@ -259,7 +259,7 @@
+ } -result {30 60}
+ 
+ 
+-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
++test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -constraints knownBug -setup {
+     place forget .t.f2
+     place forget .t.f
+ } -body {
+@@ -276,7 +276,7 @@
+     update
+     lappend result [winfo ismapped .t.f2]
+ } -result {1 0 40 30 0 1}
+-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
++test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -constraints knownBug -setup {
+     place forget .t.f2
+     place forget .t.f
+ } -body {
+--- a/tests/scrollbar.test	2020-12-26 20:24:21.356505305 +0100
++++ b/tests/scrollbar.test	2020-12-26 20:26:32.214409209 +0100
+@@ -270,15 +270,9 @@
+     format {%.6g} [.s fraction 4 21]
+ } [format %.6g [expr {(21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
+        /([getTroughSize .s] - 1)}]]
+-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
+-    format {%.6g} [.s fraction 4 179]
+-} {1}
+ test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
+     format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s]}]]
+ } {1}
+-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
+-    format {%.6g} [.s fraction 4 178]
+-} {0.993711}
+ test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
+     expr {
+     [format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s] - 2}]]]
+@@ -491,9 +485,6 @@
+     # macOS scrollbars have no arrows nowadays
+     .s identify 8 4
+ } {trough1}
+-test scrollbar-6.12.1 {ScrollbarPosition procedure} x11 {
+-    .s identify 8 19
+-} {arrow1}
+ test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {
+     # macOS scrollbars have no arrows nowadays
+     .s identify 8 19
+@@ -549,9 +540,6 @@
+     .s identify [expr {[winfo width .s] / 2}] [expr {[winfo height .s]
+ 						 - [testmetrics cyvscroll .s] - 1}]
+ } {trough2}
+-test scrollbar-6.29.1 {ScrollbarPosition procedure} x11 {
+-    .s identify 8 180
+-} {arrow2}
+ test scrollbar-6.29.2 {ScrollbarPosition procedure} aqua {
+     # macOS scrollbars have no arrows nowadays
+     .s identify 8 180
+@@ -573,9 +561,6 @@
+ test scrollbar-6.34 {ScrollbarPosition procedure} unix {
+     .s identify 4 100
+ } {trough2}
+-test scrollbar-6.35 {ScrollbarPosition procedure} unix {
+-    .s identify 18 100
+-} {trough2}
+ test scrollbar-6.37 {ScrollbarPosition procedure} win {
+     .s identify 0 100
+ } {trough2}
+@@ -612,9 +597,6 @@
+     .t.s identify [expr {int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s]
+ 		       - 1}] [expr {[winfo height .t.s] / 2}] 
+ } {slider}
+-test scrollbar-6.44 {ScrollbarPosition procedure} unix {
+-    .t.s identify 100 18
+-} {trough2}
+ test scrollbar-6.46 {ScrollbarPosition procedure} win {
+     .t.s identify 100 [expr {[winfo height .t.s] - 1}]
+ } {trough2}
+--- a/tests/send.test	2020-12-26 22:31:48.460395767 +0100
++++ b/tests/send.test	2020-12-26 22:32:55.577225240 +0100
+@@ -522,10 +522,6 @@
+     set x
+ } {1 {target application died}}
+ 
+-test send-11.1 {AppendPropCarefully and AppendErrorProc procedures} {secureserver testsend} {
+-    testsend prop root InterpRegistry "0x21447 dummy\n"
+-    list [catch {send dummy foo} msg] $msg
+-} {1 {no application named "dummy"}}
+ test send-11.2 {AppendPropCarefully and AppendErrorProc procedures} {secureserver testsend} {
+     testsend prop comm Comm "c\n-r0x123 44\n-n tktest\n-s concat a b c\n"
+     update
+--- a/tests/text.test	2020-12-26 22:33:20.794786722 +0100
++++ b/tests/text.test	2020-12-26 22:35:03.560000413 +0100
+@@ -6682,7 +6682,7 @@
+ } -cleanup {
+     destroy .t
+ } -result {no_<<Selection>>_event_fired}
+-test text-27.15d {<<Selection>> virtual event on <Delete> with cursor inside selection} -body {
++test text-27.15d {<<Selection>> virtual event on <Delete> with cursor inside selection} -constraints knownBug -body {
+     pack [text .t]
+     .t insert end "There is a selection in this text widget,\n"
+     .t insert end "and it will be impacted by the <Delete> event received.\n"
+--- a/tests/unixEmbed.test	2020-12-26 22:51:50.192506259 +0100
++++ b/tests/unixEmbed.test	2020-12-26 22:52:21.590963386 +0100
+@@ -1086,7 +1086,7 @@
+ } -result {{} {{key b}}}
+ 
+ test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
+-    unix notAqua
++    knownBug
+ } -setup {
+ 	deleteWindows
+ } -body {
+--- a/tests/textWind.test	2020-12-26 23:02:18.379690140 +0100
++++ b/tests/textWind.test	2020-12-26 23:02:51.948113638 +0100
+@@ -790,7 +790,7 @@
+     {{can't embed .t relative to .t}} \
+     [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+ 
+-test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup {
++test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -constraints knownBug -setup {
+     .t delete 1.0 end
+     destroy .t2
+     proc bgerror args {
+--- a/tests/winWm.test	2020-12-26 23:03:20.701619782 +0100
++++ b/tests/winWm.test	2020-12-26 23:03:46.991168197 +0100
+@@ -532,7 +532,7 @@
+     destroy .tx .t .sd
+ } -result {ok}
+ 
+-test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
++test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -constraints knownBug -setup {
+     destroy .t
+     toplevel .t
+     set winwm92 {}
+--- a/tests/winfo.test	2020-12-26 23:04:34.411353552 +0100
++++ b/tests/winfo.test	2020-12-26 23:05:25.199480886 +0100
+@@ -291,7 +291,7 @@
+ test winfo-9.3 {"winfo viewable" command} -body {
+     winfo viewable .
+ } -result {1}
+-test winfo-9.4 {"winfo viewable" command} -body {
++test winfo-9.4 {"winfo viewable" command} -constraints knownBug -body {
+     wm iconify .
+     winfo viewable .
+ } -cleanup {
+@@ -320,7 +320,7 @@
+ } -cleanup {
+     deleteWindows
+ } -result {0 0}
+-test winfo-9.7 {"winfo viewable" command} -setup {
++test winfo-9.7 {"winfo viewable" command} -constraints knownBug -setup {
+     deleteWindows
+ } -body {
+     frame .f1 -width 100 -height 100 -relief raised -bd 2
+--- a/tests/wm.test	2020-12-26 23:06:24.946454094 +0100
++++ b/tests/wm.test	2020-12-26 23:09:41.055082358 +0100
+@@ -805,7 +805,7 @@
+     destroy .t2 .r.f
+ } -result {can't iconify .t2: it is an embedded window}
+ 
+-test wm-iconify-3.1 {iconify behavior} -body {
++test wm-iconify-3.1 {iconify behavior} -constraints knownBug -body {
+     toplevel .t2
+     wm geom .t2 -0+0
+     update
+@@ -1413,7 +1413,7 @@
+ 
+ deleteWindows
+ 
+-test wm-stackorder-3.1 {unmapped toplevel} -body {
++test wm-stackorder-3.1 {unmapped toplevel} -constraints knownBug -body {
+     toplevel .t1 ; update
+     toplevel .t2 ; update
+     wm iconify .t1
+@@ -1523,7 +1523,7 @@
+     destroy .t
+ } -result {.t .}
+ test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
+-    overrideredirect toplevel on unix} -constraints x11 -body {
++    overrideredirect toplevel on unix} -constraints knownBug -body {
+     toplevel .t
+     tkwait visibility .t	    
+     wm overrideredirect .t 1
+@@ -1722,7 +1722,7 @@
+ } -result {withdrawn 0 normal 1}
+ 
+ test wm-transient-4.1 {transient toplevel is withdrawn
+-        when mapped if master is iconic} -body {
++        when mapped if master is iconic} -constraints knownBug -body {
+     toplevel .master
+     wm iconify .master
+     update
+@@ -1734,7 +1734,7 @@
+     deleteWindows
+ } -result {withdrawn 0}
+ test wm-transient-4.2 {already mapped transient toplevel
+-        is withdrawn if master is iconic} -body {
++        is withdrawn if master is iconic} -constraints knownBug -body {
+     toplevel .master
+     raiseDelay
+     wm iconify .master
+@@ -1748,7 +1748,7 @@
+     deleteWindows
+ } -result {withdrawn 0}
+ test wm-transient-4.3 {iconify/deiconify on the master
+-        does a withdraw/deiconify on the transient} -setup {
++        does a withdraw/deiconify on the transient} -constraints knownBug -setup {
+     set results [list]
+ } -body {
+     toplevel .master
+@@ -1924,7 +1924,7 @@
+     deleteWindows
+ }
+ 
+-test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
++test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints knownBug -setup {
+     deleteWindows
+     set result {}
+ } -body {
+@@ -2001,7 +2001,7 @@
+ } -cleanup {
+     deleteWindows
+ } -result {iconic}
+-test wm-state-2.8 {state change after map} -body {
++test wm-state-2.8 {state change after map} -constraints knownBug -body {
+     toplevel .t
+     update
+     wm state .t iconic
+@@ -2009,7 +2009,7 @@
+ } -cleanup {
+     deleteWindows
+ } -result {iconic}
+-test wm-state-2.9 {state change after map} -body {
++test wm-state-2.9 {state change after map} -constraints knownBug -body {
+     toplevel .t
+     update
+     wm iconify .t
diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild
index 2dc6985cfa7e..800acc505bcb 100644
--- a/dev-lang/tk/tk-8.5.17-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.17-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tk/tk-8.6.10.ebuild b/dev-lang/tk/tk-8.6.10.ebuild
new file mode 100644
index 000000000000..ba3a658ca1b7
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.10.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!aqua? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	"${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+	"${FILESDIR}"/${P}-test.patch
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+
+	# failing test too big to be adapted
+	rm tests/textDisp.test \
+		tests/unixFont.test \
+		tests/unixWm.test \
+		|| die
+
+	popd &>/dev/null || die
+	eprefixify Makefile.in
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm configure || die
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if tc-is-cross-compiler ; then
+		export ac_cv_func_strtod=yes
+		export tcl_cv_strtod_buggy=1
+	fi
+
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_test() {
+	virtx emake test
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	if multilib_is_native_abi; then
+		dosym wish${v1} /usr/bin/wish
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild
index a3e8883accb3..976827f37cd0 100644
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/whitespace/Manifest b/dev-lang/whitespace/Manifest
index 151d2f04ac7d..06c4c452a749 100644
--- a/dev-lang/whitespace/Manifest
+++ b/dev-lang/whitespace/Manifest
@@ -1,4 +1,4 @@
 AUX whitespace-0.4-ghc-7.10.patch 814 BLAKE2B f9746fd7bd9e51b7429a14b89d617c256ea76004384a1773b3ef35aeaa8518e96db9d53cf52dba025a96d44b3f97d11b42a3c0fa51bb40c15bfa2dfa65a66d22 SHA512 b0202b848539ef1d04974fce40facc8c0090d35da77d6fc98cb7da296efb89a8b81efda1f3dd045115417fc1471b4298be913992dd4a9772642c31ec5960fa90
 DIST whitespace-0.4.tar.gz 16428 BLAKE2B d5353b05b80a14ed0583513568d2889816c9e8b7fca8d5253bb5def584c5d43cb0ed8fa46943e7c6c0f82b6424dd01879b7beaaad813a5beb6fc3081f4dfd618 SHA512 2a1c932d650f6cfd55bb7c08b8882086143bc9ec2b0f639a7452116d86f12daff1a1268d7451003a6bf8635fbf1ad23e9203410fd423ce16d4239c1b552d7046
-EBUILD whitespace-0.4.ebuild 604 BLAKE2B 4ccb2c26db55366652837e711a44dd559467438dccd82de1482e25673311f7d7723d4cf874f229270e1f7ce75a583100f33974dc82b36a82d5c8ee5f1e298901 SHA512 12062df7bafcb906af123c13a86c6e6810645c1fea32c6db7747e714ed7a188a732a29985143d2a16ef1e49339620b6a6b9566de72104b6b318f7a78f6ed3a16
-MISC metadata.xml 335 BLAKE2B aed6ce9148bbca7ce32faf271998e85b612514fd59accd2010735b4971664479b2ce4fd16673a2a1e534ea92cf5d1df7774038937e7d428d649171bde27937f5 SHA512 eea77baf66a4e0d4bd5a703a6cf31258f47bd2f9f2f6975fa7b4ee401db4fdd6a27e6f0698313d71a059f2ae14b05f5148d2e844f4b7a05d7e5e49b4302a803a
+EBUILD whitespace-0.4.ebuild 576 BLAKE2B 860f01c0883876ab046bdf531ab80f168e2d957579f72633671fc82050c6e0107c7401557a7ab99630a9e58d3824ee31942a5b2763c5e294d1208dee03bb6b62 SHA512 c7eca5ceff08e527a603c8de8224769d78c34106810b6f2bd4c042837d78bf7f609feafd1178e4169214a8271deeb4107d53ad5ba6688bf008bec1b702146494
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-lang/whitespace/metadata.xml b/dev-lang/whitespace/metadata.xml
index 41574f2e48b6..b7878815d80d 100644
--- a/dev-lang/whitespace/metadata.xml
+++ b/dev-lang/whitespace/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">haroldl/whitespace-nd</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/whitespace/whitespace-0.4.ebuild b/dev-lang/whitespace/whitespace-0.4.ebuild
index c84fac19416d..1efe97570ebb 100644
--- a/dev-lang/whitespace/whitespace-0.4.ebuild
+++ b/dev-lang/whitespace/whitespace-0.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.5.9999
+# ebuild generated by hackport 0.6.7.9999
 
-CABAL_FEATURES="bin"
-inherit eutils haskell-cabal
+CABAL_FEATURES=""
+inherit haskell-cabal
 
 DESCRIPTION="Whitespace, an esoteric programming language"
 HOMEPAGE="https://github.com/haroldl/whitespace-nd"
@@ -17,13 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="dev-haskell/random:=
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-	dev-haskell/random
-	>=dev-lang/ghc-6.10.4
+	>=dev-haskell/cabal-1.2
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=("${FILESDIR}"/${P}-ghc-7.10.patch)
-- 
cgit v1.2.3