gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-lang
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
75 files changed, 2151 insertions, 875 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e7c586d424b4..69c171eb6fe4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/cxprolog/Manifest b/dev-lang/cxprolog/Manifest
index 77a84aa5ec1e..1afc2cd89412 100644
--- a/dev-lang/cxprolog/Manifest
+++ b/dev-lang/cxprolog/Manifest
@@ -3,5 +3,5 @@ AUX cx_dev_boot.pl 141 BLAKE2B dea2a7baf1050f916ca5bc200bf7768c353ec6e59752031fb
 AUX cxprolog-0.98.2-portage.patch 3806 BLAKE2B 6270cf9e19d6fd2f24a19a8d0e5af672c523530b1fece9146b49bda2b5ab97f79f69d55a15b56ace9dd5ecc15a693f1700700e9e902846113075441e587d5873 SHA512 f20ef4c01f27cc290efc5daf16a44a081072d0640282c9a995efacdb05548e547478201facd395b5067a22847bf51a25a9faf4c1bdec0510cf5c9031979d249a
 AUX cxprolog-0.98.2-test-io.patch 580 BLAKE2B 5a4844e4f3469270ab33889f07b812aa5b457f6cf0dc49c2b05c6360a91ea9809c26743566ea66c41e7ae0fa1aa3a05945245d234267b8b39f52ae452034bf73 SHA512 4c39bf891c0d7291b1f1ff926367f5613fed61455dd35747eb0fcd5bcdd0eb93fb86ca82b58b194e5ea2dbcf62e7f0179c5a97186f42e83c707a6022f829704d
 DIST cxprolog-0.98.2.src.tgz 548222 BLAKE2B e1e834384ff161efde961e7a319d9987cb368ed561fa613a4dd2ede353a099de9146de68dedab3d5e74bb5421c880f743b669eb43eb0b265112dbf938820b0ad SHA512 7e16ce238201da2520da3575311a8c56c9fc3926b290ef505e74ca208af9e6a070d4137ae21e708e1d6c9b83e44566ecd818d51a90f033c983c589b65bcbf2b1
-EBUILD cxprolog-0.98.2.ebuild 3263 BLAKE2B e8fc115df73325f5ca35492f93f1dffc1a13718e118ede474179eac54a1a42c371996f28e17020c7af4893ea834b39a8372eb278a6614d304a7f0ec50c078127 SHA512 c85cf2741546917558a90846fa2519a498e1a467bfb5f33ed3e2d5a4a2c37738bd8642f31a1aa87b90c78db3c1c9a1d83c9425e5ac46de9d86409ebd060bdeed
+EBUILD cxprolog-0.98.2.ebuild 3261 BLAKE2B c25412fbd0c45fd8aed3a4e60952bf88eb2d3cecc1ada69a5b264cc0088734f1413418e9d677e336abcb7dacd5640c6549adeb58bca4d9c887ea7e67acf5993d SHA512 163759a17790d9feda186d1b46dbae8b48722204a575357cbbe6494d45646efedef4842042d890bd538146de6e2fbf5ce80e18f112dddb5691f7d6bcda3ef9d5
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
index a89a12f52e41..77c3bde5c40b 100644
--- a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
+++ b/dev-lang/cxprolog/cxprolog-0.98.2.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
@@ -14,7 +14,7 @@ SRC_URI="http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/${P}.src.tgz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples java +readline test wxwidgets"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 89c7c6108d14..0a32c9921ffd 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -3,5 +3,7 @@ AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82
 AUX elixir-1.11.2-mksh.patch 2058 BLAKE2B 45e14921fc59f5707ee9bc2aaebea5f090a5995d07e1aa773d3751690230ded1abade17179f643e787ae3b53661c8ad7bafdf295fd1eb21d534c0b38a0083a1b SHA512 a888b73638873a5b7a6c5f2576c81d58e8df854e2ab3ecfbcf547da5aeea4eee0f43798a1c1308bc7f3515af2d28e78740c4016fde0f5e0eea2114dac7d98de6
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0372bd09e8c0a357a24bcca9a06350973f1453f482d3854a48712471c55389c3bd530df46a19c20a359376b779d SHA512 5dc940a31a31ae1c1537f874c15e58311cc0b0452f61e923bdfde0a5cfef3d8003eb3e85be320eb0acfb7bc0c0c0dc8ac965dec6727257c244048268fbf38ceb
+DIST elixir-1.12.0.tar.gz 2457567 BLAKE2B 9adc3d54e2200cddaab0323a8e1c8affae6ad0fbee2c48da87249db0f29d31158ef0a74edf95128302183ba3ee714f502df6d30048c49b42c190d1a43e4e8308 SHA512 6ae99c0307d2adaa51cc8b569329592509b1e19bf9f78d4230507c11229da674476c0be65bc9ce5e3b0d78082182755a76abc8beff59af1f84672dd73e5b912f
 EBUILD elixir-1.11.4.ebuild 922 BLAKE2B 718117a8aee4294e70930d45d6b39d6522026c48165b9af54eae4b612458509e456586e8c6a256175ed4e66a6e36293d22d65d69b1fb40ec28efb6ee1b511fbf SHA512 e77cad093155fbcbab5247c18c4c45db407df167c296d9587c19826d303c0e38f431bb4c3ea61537dbfd0c211d4917ce08a38c6f6a2c7fb1c6040c0e279c9b8a
+EBUILD elixir-1.12.0.ebuild 886 BLAKE2B 946c6fb8fc5b2500ff4a58bda868b3ed5beacd1065e49ca410a0fb38c3411482843dce90a4eab87ae8ac96567cd167ffcafcbf960dd059d8411744e3fd125597 SHA512 8256f2f7d0d3e064b99059f5d9b2defb4275bbaf81529e44bd761b28e035e11dfcba21c8f446b9368198d9047980fc955c3c6faa9bd03a9c818ccd2e26dd0c49
 MISC metadata.xml 820 BLAKE2B 7fd55cc9f7450d46060069909506fb74e93234ccd319b5f5b428580fd4f55c59c2ada78770ae744d784838574d87522d3e94f101eba06b5a64ebcb513db4eef3 SHA512 11300d8d6d6cbb73b55d4dfb44d04fc087867bab1fc3fcb0564473d911844d3be148170c03a9247c6a407d8de88442ca6017c00177d93be46b37166d3ba42593
diff --git a/dev-lang/elixir/elixir-1.12.0.ebuild b/dev-lang/elixir/elixir-1.12.0.ebuild
new file mode 100644
index 000000000000..e35418c14594
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-lang/erlang-22:0=[ssl]
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 474f67919e59..df0762240088 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -7,11 +7,15 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 DIST erlang-23.3.1.tar.gz 56654422 BLAKE2B b1ccd870d4a47f12d1a65b424d6c6b0f59a4654c0779c595fb28fdc2d3e179bb9b12d2473770b239b65665b2f6a3281d239f9fb3d6b86548df3ee69fce8fe5ed SHA512 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0
-DIST erlang-23.3.3.tar.gz 56671339 BLAKE2B 19455670d411adfb6a34a42e27ee8ff9eda052c9e096404f1d1061376ffecb136b912cb89a21cb84a7758c925ccccee5bbbb4ca31ac6b164af4813b0a5e9e747 SHA512 191243df10e0ee03db1a16c94253fefd4b008915464b2966f6fbe93faae3053b2a8950297054a6a8554c180fd3fcc18eda16e2f87e0c1a7a73570e753ec557d4
 DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5
+DIST erlang-24.0.1.tar.gz 58860070 BLAKE2B a52f6f18173f7dcc79cc3f47155fb08854eaef29e52b78e5b78f5239c2f2617c20be3878ba01511d942f0fd0351b44c982fd5ad29ed1da6d8939d05364342238 SHA512 8e6588e69e58395c92a6cd9e63ff4da688e8fe8b1cc6dea3e3bb5b102940854a73a1a6363e8f94c697117a7be0f8b07712cb584af1d9ef9947eb87b09c8559e6
+DIST erlang-24.0.tar.gz 58258571 BLAKE2B ee71c1f19a1d990977d3764bf4122593a216e4bbbef7e5a8a5c7e22142171ef869b4a5ac01aa1f4495eaf79808cbb677d4163a52917879e2a615f08e20480c7e SHA512 bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b
 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
+DIST erlang_doc_html_24.0.tar.gz 39731398 BLAKE2B 8a9fe3acb4cc13691e16c477cf89e8298df1a99bbe6a6c9e59e3c34248ecdc21077835951087b5a5bbb23ddb28f3bd7ab8b058fe64ce56c342b825a6c0ef8948 SHA512 453f8a9cf779a4f43966615433afc3be3aae7a571acf45974947bd720a331ca05949bc310de5f3b33b72d274971103ede56875bbfe757ba17f903510f690d97e
 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
+DIST erlang_doc_man_24.0.tar.gz 1666152 BLAKE2B aaef8165322f39f7410840eafe562ec5038d9c89b4fa99b3b1d5748ba70fe755ba732de403dd916328e1fdcec895e2a347db4fb8c8837b5e41155439c9c54ef6 SHA512 7251f6eeb0534cc8538236a2c4be9d732bf0a05ba6832f9b3859116f9148e469d004331924c7187b07204798afb66067bfd321c8905000c355775927e5841918
 EBUILD erlang-23.3.1.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5
-EBUILD erlang-23.3.3.ebuild 4504 BLAKE2B 16b09bf6af1c223776b5cb2c55c32dbd5eb540cb9ae12496485f64bc1820c4118575a155440764144e10c6d50609db02ae5eb2c691a0bf82b63c0ec1454a4f41 SHA512 f4bf67b5b4bba5734893e67c50e46c7387c192455befea44eabf1ca5aa1f76dd05eeab1dd9eb7c34c230553ce0864493e81e3185fd5d6554a8cc239ecb49f441
 EBUILD erlang-23.3.4.ebuild 4504 BLAKE2B 16b09bf6af1c223776b5cb2c55c32dbd5eb540cb9ae12496485f64bc1820c4118575a155440764144e10c6d50609db02ae5eb2c691a0bf82b63c0ec1454a4f41 SHA512 f4bf67b5b4bba5734893e67c50e46c7387c192455befea44eabf1ca5aa1f76dd05eeab1dd9eb7c34c230553ce0864493e81e3185fd5d6554a8cc239ecb49f441
+EBUILD erlang-24.0.1.ebuild 4523 BLAKE2B d17d8fbb7bf14688c4ca9bb041d451cb5cbf37be845ec0e7be165c3a9bc7fe81efd8a0fc7084cd6b5fed930eaad4258be20a56a98e1d19dff6ce9f27ff9d8425 SHA512 d8739eda6d6706da9db5c9bc31048e366c1fc5a4d62d70f732b74b6a26babcd86254678b6ab0572a0b02b1d38fa1bf2205f10d71c670f932d8212b849c567197
+EBUILD erlang-24.0.ebuild 4523 BLAKE2B d17d8fbb7bf14688c4ca9bb041d451cb5cbf37be845ec0e7be165c3a9bc7fe81efd8a0fc7084cd6b5fed930eaad4258be20a56a98e1d19dff6ce9f27ff9d8425 SHA512 d8739eda6d6706da9db5c9bc31048e366c1fc5a4d62d70f732b74b6a26babcd86254678b6ab0572a0b02b1d38fa1bf2205f10d71c670f932d8212b849c567197
 MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
diff --git a/dev-lang/erlang/erlang-23.3.3.ebuild b/dev-lang/erlang/erlang-24.0.1.ebuild
index 257dbb6d4a2c..01313ebc6b11 100644
--- a/dev-lang/erlang/erlang-23.3.3.ebuild
+++ b/dev-lang/erlang/erlang-24.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 WX_GTK_VER="3.0-gtk3"
 
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+inherit elisp-common java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 
 # NOTE: If you need symlinks for binaries please tell maintainers or
 # open up a bug to let it be created.
@@ -23,7 +23,7 @@ LICENSE="Apache-2.0"
 # 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 ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
+IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
 	acct-group/epmd
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/otp-OTP-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/18.2.1-wx3.0.patch
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
 )
 
@@ -54,6 +53,7 @@ SITEFILE=50"${PN}"-gentoo.el
 src_prepare() {
 	default
 
+	tc-export AR CPP CXX LD
 	./otp_build autoconf || die
 }
 
@@ -62,11 +62,14 @@ src_configure() {
 
 	local myconf=(
 		--disable-builtin-zlib
-		$(use_enable hipe)
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
 		$(use_enable kpoll kernel-poll)
 		$(use_with java javac)
 		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_with ssl ssl)
 		$(use_enable ssl dynamic-ssl-lib)
 		$(use_enable systemd)
 		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
diff --git a/dev-lang/erlang/erlang-24.0.ebuild b/dev-lang/erlang/erlang-24.0.ebuild
new file mode 100644
index 000000000000..01313ebc6b11
--- /dev/null
+++ b/dev-lang/erlang/erlang-24.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 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 toolchain-funcs 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 ~x64-solaris"
+IUSE="doc emacs java +kpoll 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? ( >=dev-libs/openssl-0.9.7d: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}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(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/ferite/Manifest b/dev-lang/ferite/Manifest
index 940e6739ba30..9b91186c7e33 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -1,6 +1,6 @@
 AUX ferite-1.1.17-bool.patch 1935 BLAKE2B dc926f716e3abfefe48d74e638a35451ec856188e71d76797252b65d2024047543a25739c6bef81133bec0533c480b651dcea845db5dcd76eea70d1c49ed58d3 SHA512 6366d3388185541506c1adc8387c0f6fe91851c257cd4cc2d03afcae3c867e03718885f6e142812c66f429dff493b7e033288b47af54af1eede2a589ba0c1064
-AUX ferite-1.1.17-slibtool.patch 23689 BLAKE2B 838b3629fa75a652144da2dd9fbce2a075ddd877c78b206b929985453e2988f56c4263006ef9a9450726dd40e08782ca29fd052835ce8111473d6d679a9aa145 SHA512 64e05b7509d357a697eab255c92af61a61c02937dbcabd1306ecbff079565ddc7a239a7c9fe22f7392c81b8b3c7ad224c986f2bf2556f1384a4f848d575345b0
 AUX ferite-pcre.patch 1356 BLAKE2B f2c3669e33d12dce6e00d22b5884f0770021eb77297997bd94e777b114f8ae24f7ed23b10d7c877a7bffb61fe9ff0e126bd717ea8c8a8fb8186da89178ba4926 SHA512 e867c4b2fc993963bdf17d992d3dd007f636c85b0c13388480cec0f0ff70b6596274c19cd46b0e3ee11064f607b381f7f76888819ef6fb3bdd0804b07b5087fc
+DIST ferite-1.1.17-slibtool.patch.bz2 3945 BLAKE2B d816ccab7a58049e9c6048a5c5f4e162d8444a7c998eab1eadc76eb212cb08f9b0b68a96a2cc9003fbf923ab0bf8a7c25bae4d6ef08cdd21de054cd2ed910aa3 SHA512 772ad133016cef5c20905dd7ef589ced3d5bba7a327ddcca0db4ab8b7e59eb9a2d521372ed18c16594f418ec9c7195b711ac5d4dba6bc900b74e93d14f9ce36b
 DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f
-EBUILD ferite-1.1.17-r1.ebuild 2000 BLAKE2B e17ae71d2d7aabc08aded70d852169e086d9e0f7da54f19653d7d43dd24703f5737f3a3d7e5f45683ccf81fa5d5d51e66f79931be2cdb0d9f22a01613b593fea SHA512 d729a192c0ab752fbb408656fc8bc0156ffa524c39852dcf6bb85535b77de6f7b1d6f4f6c336c24ed38235167b9316ff5ddcfa66ca27d072c2cf4ba511f76e1b
+EBUILD ferite-1.1.17-r1.ebuild 2084 BLAKE2B 0cadea8ef190aaaf7c8e15cc49f6ed6ccaf80b4b222a89a2cb7e2899e6e471bd1a2dc5b121901eeeab85549744ae51a434be152b9710d1a231c1f54349fdc27f SHA512 9aea56058b201ae6b52df812d315bcdf270cff033583cad4d3f42042749942f782952ec1ec473a6029ff44bb2d0427486895dbb33425f33caf6ad3c6989b0f9b
 MISC metadata.xml 243 BLAKE2B fc4ef3433d84176432ef31abd4960ce0e2dcd4979228bf565712a1e574451b34689a8fff3dab4142e3997f084729bba1bc3d2c38d6ddf10d95a11e0b4412e03a SHA512 e3315331fae1a640778867a807694dc624ac88e4dbae2546780534a629d65d054cc6e376245fd31432d663775121cf07d74b2f1cd65d9d2d9cf9137d6598897a
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 25c134b1f337..f3c2cbc6de5e 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A clean, lightweight, object oriented scripting language"
 HOMEPAGE="http://ferite.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-slibtool.patch.bz2"
 
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="
 	dev-libs/boehm-gc[threads]
@@ -23,7 +24,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-pcre.patch
 	"${FILESDIR}"/${P}-bool.patch
-	"${FILESDIR}"/${P}-slibtool.patch
+	"${WORKDIR}"/${P}-slibtool.patch
 )
 
 src_prepare() {
diff --git a/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch b/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch
deleted file mode 100644
index 4a6fc15de6e8..000000000000
--- a/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch
+++ /dev/null
@@ -1,569 +0,0 @@
-commit 3cbead845f607628a44d78583534e6c0a74e9af1
-Author: orbea <orbea@riseup.net>
-Date:   Mon May 10 09:38:47 2021 -0700
-
-    Fix the build with -no-undefined.
-    
-    This adds correct usage of LDFLAGS and LIBADD.
-    
-    Signed-off-by: orbea <orbea@riseup.net>
-
-diff --git a/builder/builder.h b/builder/builder.h
-index e92b410..fa0055a 100644
---- a/builder/builder.h
-+++ b/builder/builder.h
-@@ -51,10 +51,6 @@ typedef struct __builder_module {
-   "MAINTAINERCLEANFILES = %s*.h %s*.c %s*~\n\n"                                      \
-   "CLEANFILES       = \n"                                                            \
-   "\n"                                                                               \
--  "if NEED_FERITE_LIB\n"                                                             \
--  "libferite = -L${top_builddir}/src -lferite\n"                                     \
--  "endif\n\n"                                                                        \
--  "LDFLAGS          = $(libferite) -L${libdir} @%s_LIBS@\n"                          \
-   "INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @%s_CFLAGS@\n" \
-   "DEFS             = @thread_defs@\n"                                               \
-   "\nscripts_DATA   = %s\nscriptsdir       = @FE_XPLAT_LIBRARY_PATH@\n\n"            \
-@@ -65,7 +61,7 @@ typedef struct __builder_module {
-   "\n"                                                                               \
-   "%s_la_SOURCES    = %s %s\n"                                                       \
-   "%s_la_LDFLAGS    = -no-undefined -module -avoid-version\n"                        \
--  "%s_la_LIBADD     =\n"                                                             \
-+  "%s_la_LIBADD     = ${top_builddir}/src/libferite.la\n"                            \
-   "\n"                                                                               \
-   "%s_core.c: %s\n"                                                                  \
-   "\t%s -m %s %s/%s/%s\n\n%s"    
-diff --git a/configure.ac b/configure.ac
-index 5b2f644..d5e713d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,8 +78,6 @@ AC_DEFINE_UNQUOTED([PLATFORM], "$platform", [The Platform on which we exist])
- CFLAGS="-DHAVE_CONFIG_HEADER -L$prefix/lib $CFLAGS"
- CCFLAGS="-DHAVE_CONFIG_HEADER  -L$prefix/lib $CCFLAGS"
- 
--AM_CONDITIONAL(NEED_FERITE_LIB, test "$system" = "Darwin" -o "$system" = "CYGWIN" -o "$system" = "SunOS" -o "$system" = "MINGW")
--
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
-diff --git a/libs/aphex/src/Makefile.am b/libs/aphex/src/Makefile.am
-index 2b14cb7..57a8311 100644
---- a/libs/aphex/src/Makefile.am
-+++ b/libs/aphex/src/Makefile.am
-@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS     = no-dependencies foreign
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--LDFLAGS		         = -L${prefix}/lib
--
- INCLUDES	         = -I${top_srcdir}/libs/aphex/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @aphex_INCS@
-                        
- 			
-@@ -18,7 +16,7 @@ noinst_LTLIBRARIES   = libaphex.la
- include_HEADERS      =
- 
- libaphex_la_DEPENDENCIES = $(top_builddir)/config.h
--libaphex_la_LDFLAGS      = -no-undefined $(LDFLAGS) -m @aphex_LDFLAGS@
-+libaphex_la_LDFLAGS      = -no-undefined -m @aphex_LDFLAGS@
- libaphex_la_LIBADD       = @thread_libs@ @gc_libs@
- 
- libaphex_la_SOURCES  = aphex_file.c aphex_directory.c aphex_config.c aphex_match.c aphex_thread.c aphex_notify.c poll.c poll.h
-diff --git a/libs/triton/src/Makefile.am b/libs/triton/src/Makefile.am
-index 0572996..0b25ba3 100644
---- a/libs/triton/src/Makefile.am
-+++ b/libs/triton/src/Makefile.am
-@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS     = no-dependencies foreign
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--LDFLAGS		         = -L/usr/local/lib
--
- INCLUDES	         = -I${top_srcdir} -I${top_srcdir}/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @TRITON_INCS@
- 
- DEFS                 = @debugdefs@
-@@ -23,6 +21,6 @@ CLEANFILES = libltdl.la libltdlc.la
- include_HEADERS      =
- 
- libtriton_la_DEPENDENCIES = $(top_builddir)/config.h
--libtriton_la_LDFLAGS      = -no-undefined $(LDFLAGS) -m @TRITON_LDFLAGS@
-+libtriton_la_LDFLAGS      = -no-undefined -m @TRITON_LDFLAGS@
- 
- libtriton_la_SOURCES = triton_core.c  triton_loader_dlfcn.c triton_loader_ltdl.c triton_loader_darwin.c triton_loader_win32.c
-diff --git a/modules/array/Makefile.am b/modules/array/Makefile.am
-index 9f0475d..8bef2b8 100644
---- a/modules/array/Makefile.am
-+++ b/modules/array/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = array*.h array*.c array*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @array_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @array_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = array.la
- 
- array_la_SOURCES    = array_core.c array_misc.c array_Array.c array_header.h  util.c util.h 
- array_la_LDFLAGS    = -no-undefined -module -avoid-version
--array_la_LIBADD     =
-+array_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- array_core.c: @MODULE_SRC_PREFIX@/array/array.fec 
- 	@BUILDER@ -m array @MODULE_SRC_PREFIX@/array/array.fec
-diff --git a/modules/date/Makefile.am b/modules/date/Makefile.am
-index ab646b4..976baa0 100644
---- a/modules/date/Makefile.am
-+++ b/modules/date/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = date*.h date*.c date*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @date_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @date_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = date.la
- 
- date_la_SOURCES    = date_core.c date_header.h date_misc.c date_Alarm.c date_Date.c util_date.c util_date.h strptime.c
- date_la_LDFLAGS    = -no-undefined -module -avoid-version
--date_la_LIBADD     =
-+date_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- date_core.c: @MODULE_SRC_PREFIX@/date/date.fec
- 	@BUILDER@ -m date @MODULE_SRC_PREFIX@/date/date.fec
-diff --git a/modules/filesystem/Makefile.am b/modules/filesystem/Makefile.am
-index ac5b5e9..227a5ab 100644
---- a/modules/filesystem/Makefile.am
-+++ b/modules/filesystem/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = filesystem*.h filesystem*.c filesystem*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite  -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @filesystem_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @filesystem_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = filesystem.la
- 
- filesystem_la_SOURCES    = filesystem_core.c filesystem_misc.c filesystem_FileSystem.c filesystem_Directory.c filesystem_File.c filesystem_header.h  
- filesystem_la_LDFLAGS    = -no-undefined -module -avoid-version
--filesystem_la_LIBADD     =
-+filesystem_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- filesystem_core.c: @MODULE_SRC_PREFIX@/filesystem/filesystem.fec
- 	@BUILDER@ -m filesystem @MODULE_SRC_PREFIX@/filesystem/filesystem.fec
-diff --git a/modules/ipc/Makefile.am b/modules/ipc/Makefile.am
-index 3367aa2..18f9593 100644
---- a/modules/ipc/Makefile.am
-+++ b/modules/ipc/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = ipc*.h ipc*.c ipc*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @ipc_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @ipc_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = ipc.la
- 
- ipc_la_SOURCES    = ipc_core.c ipc_misc.c ipc_IPCObject.c ipc_header.h  
- ipc_la_LDFLAGS    = -no-undefined -module -avoid-version
--ipc_la_LIBADD     =
-+ipc_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- ipc_core.c: @MODULE_SRC_PREFIX@/ipc/ipc.fec 
- 	@BUILDER@ -m ipc @MODULE_SRC_PREFIX@/ipc/ipc.fec
-diff --git a/modules/math/Makefile.am b/modules/math/Makefile.am
-index 21a2ebc..f3a7f09 100644
---- a/modules/math/Makefile.am
-+++ b/modules/math/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = math*.h math*.c math*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @math_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @math_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = math.la
- 
- math_la_SOURCES    = math_core.c math_misc.c math_Math.c math_Math_Complex.c math_header.h  
- math_la_LDFLAGS    = -no-undefined -module -avoid-version
--math_la_LIBADD     =
-+math_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- math_core.c: @MODULE_SRC_PREFIX@/math/complex.fec @MODULE_SRC_PREFIX@/math/math.fec 
- 	@BUILDER@ -m math @MODULE_SRC_PREFIX@/math/math.fec
-diff --git a/modules/network/Makefile.am b/modules/network/Makefile.am
-index 91aff1a..d753ed7 100644
---- a/modules/network/Makefile.am
-+++ b/modules/network/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = network*.h network*.c network*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @network_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @network_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = network.la
- 
- network_la_SOURCES    = network_core.c network_misc.c network_Network.c network_Network_TCP.c network_Network_TCP_Stream.c  network_Network_Host.c network_Network_UDP.c network_Network_UDP_Stream.c network_Network_Service.c network_header.h  util_network.c util_network.h 
- network_la_LDFLAGS    = -no-undefined -module -avoid-version
--network_la_LIBADD     =
-+network_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- network_core.c: @MODULE_SRC_PREFIX@/network/network.fec 
- 	@BUILDER@ -m network @MODULE_SRC_PREFIX@/network/network.fec
-diff --git a/modules/number/Makefile.am b/modules/number/Makefile.am
-index 6a39962..1203c68 100644
---- a/modules/number/Makefile.am
-+++ b/modules/number/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = number*.h number*.c number*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @number_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @number_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = number.la
- 
- number_la_SOURCES    = number_core.c number_misc.c number_Number.c number_header.h  
- number_la_LDFLAGS    = -no-undefined -module -avoid-version
--number_la_LIBADD     =
-+number_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- number_core.c: @MODULE_SRC_PREFIX@/number/number.fec 
- 	@BUILDER@ -m number @MODULE_SRC_PREFIX@/number/number.fec
-diff --git a/modules/posix/Makefile.am b/modules/posix/Makefile.am
-index 8c5d8e9..bfd96fa 100644
---- a/modules/posix/Makefile.am
-+++ b/modules/posix/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = posix*.h posix*.c posix*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @posix_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @posix_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = posix.la
- 
- posix_la_SOURCES    = posix_core.c posix_misc.c posix_Posix.c posix_Posix_Uname.c posix_Posix_Rlimit.c posix_Posix_User.c posix_Posix_Pipe.c posix_Posix_Rusage.c posix_Posix_ProcessStream.c posix_Posix_Stat.c posix_Posix_SelectResult.c posix_Posix_Group.c posix_header.h  util_posix.c util_posix.h util_user.c util_user.h util_signal.c util_signal.h
- posix_la_LDFLAGS    = -no-undefined -module -avoid-version
--posix_la_LIBADD     =
-+posix_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- posix_core.c: @MODULE_SRC_PREFIX@/posix/posix.fec @MODULE_SRC_PREFIX@/posix/posix_consts.fec
- 	@BUILDER@ -m posix @MODULE_SRC_PREFIX@/posix/posix.fec
-diff --git a/modules/reflection/Makefile.am b/modules/reflection/Makefile.am
-index 8d02b47..0509819 100644
---- a/modules/reflection/Makefile.am
-+++ b/modules/reflection/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = reflection*.h reflection*.c reflection*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @reflection_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @reflection_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = reflection.la
- 
- reflection_la_SOURCES    = reflection_core.c reflection_misc.c reflection_Reflection.c reflection_Namespace.c reflection_Function.c reflection_Class.c reflection_Variable.c reflection_Object.c reflection_header.h  utility.c 
- reflection_la_LDFLAGS    = -no-undefined -module -avoid-version
--reflection_la_LIBADD     =
-+reflection_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- reflection_core.c: @MODULE_SRC_PREFIX@/reflection/reflection.fec 
- 	@BUILDER@ -m reflection @MODULE_SRC_PREFIX@/reflection/reflection.fec
-diff --git a/modules/regexp/Makefile.am b/modules/regexp/Makefile.am
-index 9bf9df6..4bf74be 100644
---- a/modules/regexp/Makefile.am
-+++ b/modules/regexp/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = regexp*.h regexp*.c regexp*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @regexp_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @regexp_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = regexp.la
- 
- regexp_la_SOURCES    = regexp_core.c regexp_misc.c regexp_MatchObject.c regexp_Regexp.c regexp_header.h  
- regexp_la_LDFLAGS    = -no-undefined -module -avoid-version
--regexp_la_LIBADD     =
-+regexp_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- regexp_core.c: @MODULE_SRC_PREFIX@/regexp/regexp.fec  
- 	@BUILDER@ -m regexp @MODULE_SRC_PREFIX@/regexp/regexp.fec
-diff --git a/modules/serialize/Makefile.am b/modules/serialize/Makefile.am
-index 0d40c38..ac58c8a 100644
---- a/modules/serialize/Makefile.am
-+++ b/modules/serialize/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = serialize*.h serialize*.c serialize*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @serialize_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @serialize_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = serialize.la
- 
- serialize_la_SOURCES    = serialize_core.c serialize_misc.c serialize_Serialize.c serialize_header.h  utility.c utility.h 
- serialize_la_LDFLAGS    = -no-undefined -module -avoid-version
--serialize_la_LIBADD     =
-+serialize_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- serialize_core.c: @MODULE_SRC_PREFIX@/serialize/serialize.fec 
- 	@BUILDER@ -m serialize @MODULE_SRC_PREFIX@/serialize/serialize.fec
-diff --git a/modules/stream/Makefile.am b/modules/stream/Makefile.am
-index 5f6adf1..1ed7e61 100644
---- a/modules/stream/Makefile.am
-+++ b/modules/stream/Makefile.am
-@@ -7,18 +7,12 @@ MAINTAINERCLEANFILES = stream*.h stream*.c stream*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @stream_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @stream_CFLAGS@
- DEFS             = @thread_defs@
- 
- lib_LTLIBRARIES  = libferitestream.la
- libferitestream_la_SOURCES = util_stream.c
--libferitestream_la_LIBADD       = $(LDFLAGS)	 
--libferitestream_la_DEPENDENCIES = 
-+libferitestream_la_LIBADD       = ${top_builddir}/src/libferite.la
- libferitestream_la_LDFLAGS      = -version-info 1:0:0 -export-dynamic -no-undefined
- 
- fsl_DATA         = util_stream.h
-@@ -36,7 +30,7 @@ pkg_LTLIBRARIES  = stream.la
- 
- stream_la_SOURCES    = stream_core.c stream_misc.c stream_Stream.c stream_Stream_Stream.c stream_Stream_StdioStream.c stream_Stream_StringStream.c stream_Stream_PointerObject.c stream_header.h  util_stream.c util_stream.h 
- stream_la_LDFLAGS    = -no-undefined -module -avoid-version  -L. -lferitestream
--stream_la_LIBADD     =
-+stream_la_LIBADD     = libferitestream.la
- 
- stream_core.c: @MODULE_SRC_PREFIX@/stream/stream.fec
- 	@BUILDER@ -m stream @MODULE_SRC_PREFIX@/stream/stream.fec
-diff --git a/modules/string/Makefile.am b/modules/string/Makefile.am
-index 851d2ff..ff83887 100644
---- a/modules/string/Makefile.am
-+++ b/modules/string/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = string*.h string*.c string*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @string_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @string_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = string.la
- 
- string_la_SOURCES    = string_core.c string_misc.c string_String.c string_header.h  
- string_la_LDFLAGS    = -no-undefined -module -avoid-version
--string_la_LIBADD     =
-+string_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- string_core.c: @MODULE_SRC_PREFIX@/string/string.fec 
- 	@BUILDER@ -m string @MODULE_SRC_PREFIX@/string/string.fec
-diff --git a/modules/sys/Makefile.am b/modules/sys/Makefile.am
-index ac60b56..01c7e8f 100644
---- a/modules/sys/Makefile.am
-+++ b/modules/sys/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = sys*.h sys*.c sys*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @sys_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @sys_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = sys.la
- 
- sys_la_SOURCES    = sys_core.c sys_misc.c sys_Sys.c sys_Sys_env.c sys_header.h   
- sys_la_LDFLAGS    = -no-undefined -module -avoid-version
--sys_la_LIBADD     =
-+sys_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- sys_core.c: @MODULE_SRC_PREFIX@/sys/env.fec @MODULE_SRC_PREFIX@/sys/std.fec @MODULE_SRC_PREFIX@/sys/sys.fec
- 	@BUILDER@ -m sys @MODULE_SRC_PREFIX@/sys/sys.fec
-diff --git a/modules/test/Makefile.am b/modules/test/Makefile.am
-index aeb7940..b99b0de 100644
---- a/modules/test/Makefile.am
-+++ b/modules/test/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = test*.h test*.c test*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @test_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @test_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = test.la
- 
- test_la_SOURCES    = test_core.c test_misc.c test_Test.c test_header.h  utility.c utility.h 
- test_la_LDFLAGS    = -no-undefined -module -avoid-version
--test_la_LIBADD     =
-+test_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- test_core.c: @MODULE_SRC_PREFIX@/test/test.fec 
- 	@BUILDER@ -m test @MODULE_SRC_PREFIX@/test/test.fec
-diff --git a/modules/thread/Makefile.am b/modules/thread/Makefile.am
-index 3d6cfb2..c5438e4 100644
---- a/modules/thread/Makefile.am
-+++ b/modules/thread/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = thread*.h thread*.c thread*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @thread_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @thread_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = thread.la
- 
- thread_la_SOURCES    = thread_core.c thread_misc.c thread_Thread.c thread_Mutex.c thread_Event.c thread_header.h  utility.c 
- thread_la_LDFLAGS    = -no-undefined -module -avoid-version
--thread_la_LIBADD     =
-+thread_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- thread_core.c: @MODULE_SRC_PREFIX@/thread/thread.fec 
- 	@BUILDER@ -m thread @MODULE_SRC_PREFIX@/thread/thread.fec
-diff --git a/modules/unix/Makefile.am b/modules/unix/Makefile.am
-index 7999784..8fea3e7 100644
---- a/modules/unix/Makefile.am
-+++ b/modules/unix/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = unix*.h unix*.c unix*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @unix_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @unix_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = unix.la
- 
- unix_la_SOURCES    = unix_core.c unix_misc.c unix_Unix.c unix_Unix_SyslogStream.c unix_Network.c unix_Network_Unix.c unix_Network_Unix_Stream.c unix_header.h  
- unix_la_LDFLAGS    = -no-undefined -module -avoid-version
--unix_la_LIBADD     =
-+unix_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- unix_core.c: @MODULE_SRC_PREFIX@/unix/unix.fec @MODULE_SRC_PREFIX@/unix/syslog.fec @MODULE_SRC_PREFIX@/unix/unixsocket.fec
- 	@BUILDER@ -m unix @MODULE_SRC_PREFIX@/unix/unix.fec
-diff --git a/modules/xml/Makefile.am b/modules/xml/Makefile.am
-index 71a88a9..26c7cbb 100644
---- a/modules/xml/Makefile.am
-+++ b/modules/xml/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = xml*.h xml*.c xml*~~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @xml_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @xml_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = xml.la
- 
- xml_la_SOURCES    = xml_core.c xml_misc.c xml_XML.c xml_XML_SAXParser.c xml_XML_TreeParser.c xml_header.h  sax_handlers.c sax_handlers.h tree_handlers.c tree_handlers.h xpath_handlers.c xpath_handlers.h xml_XML_Element.c
- xml_la_LDFLAGS    = -no-undefined -module -avoid-version
--xml_la_LIBADD     =
-+xml_la_LIBADD     = ${top_builddir}/src/libferite.la @xml_LIBS@
- 
- xml_core.c: @MODULE_SRC_PREFIX@/xml/xml.fec 
- 	@BUILDER@ -m xml @MODULE_SRC_PREFIX@/xml/xml.fec
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 01c8649..fa2e41e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,8 +8,6 @@ MAINTAINERCLEANFILES = Makefile.in
- 
- CLEANFILES       = *~
- 
--LDFLAGS		     = -L${prefix}/lib -lm
--
- INCLUDES	     = -I$(top_srcdir) -I$(top_srcdir)/libs/aphex/include -I$(top_srcdir)/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) -I${top_srcdir}/include/ferite/ @pcre_cflags@
- 
- DEFS                 = @debugdefs@ @thread_defs@ @gc_defs@
-@@ -69,6 +67,6 @@ EXTRA_DIST = ferite_parser.y ferite_scanner.l
- 
- libferite_la_LIBADD       = $(top_builddir)/libs/triton/src/libtriton.la \
-                             $(top_builddir)/libs/aphex/src/libaphex.la \
--							-lm @pcre_libs@ @thread_libs@ @gc_libs@ $(LDFLAGS)	 
-+                            -lm @pcre_libs@ @thread_libs@ @gc_libs@
- libferite_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/libs/triton/src/libtriton.la $(top_builddir)/libs/aphex/src/libaphex.la
- libferite_la_LDFLAGS      = -version-info 1:1:0 -export-dynamic -no-undefined
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index d1dc98344816..52da78949697 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -42,9 +42,9 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-EBUILD gnat-gpl-2016-r4.ebuild 4309 BLAKE2B d09b887127874269dae21ef5befa8643b49702b4f7934af0c5d06dd5c0bd3bf7255fa5c63c644b696738a127bd5e602cc88ace982738af7453c3a5523a10f730 SHA512 62b8d6f9c09b600119af3d8fac1130e8f366bcf234a82c4bf4ce84ff8799889b9ca462f0b884ee2f78bc1744c9042d55111e8fe5d3b6d0613928981fb27bd5f9
-EBUILD gnat-gpl-2017-r1.ebuild 3895 BLAKE2B 2f9e145372267d9ecc971bb4de65bacb13eceb79cdda9c425d6e1b9dcec301daecbb605b2333cbaaf13a7eb68b1e97ebe7d2feb6a13103edebf41da04d5039fb SHA512 f646e5a21721ee83f21e7801f3693880b78907bc5985473349a6a22c9eac30bfeaed2d69cedcb3d165566525a26a8989df05a6e51372e6d4293e272a3c3f6bf0
-EBUILD gnat-gpl-2018-r3.ebuild 3858 BLAKE2B 4f3e1f2d5ae63df871f8037b223b13c0dedba5f4ce2440dd443d9cd8a9de4931e14ebad13a2f8f1fb00d8a3f62b3afb8e990d3ae7089b6d3b8164d9c5793049f SHA512 419f760f4ba7c2bfa394cdfb5b3406867cef2ea8887a4372692d6d35d022ab4e23872c79395f9a5337e23cfd201545062a2dd7318e861a3f3454ef02c4f45fa7
-EBUILD gnat-gpl-2019-r2.ebuild 3603 BLAKE2B 2df7cbc37b3080ae88c911fa75c977f48ba69e8f8d52ddfe8bca7f2f558a4a8362bfc1ab9285806a004ef70ea11dd89747214094caa8ad9aa48db89af33107bf SHA512 3c05ab26066429d83dd6efff65fdeb3e91f05446a83d8b4fc68b3d534a4c5e7ef6769f16b5d02b00747e68cc617a5b7035fd011721b9b4916b52245419405cec
-EBUILD gnat-gpl-2020.ebuild 3724 BLAKE2B bd397eceee1743af5c252c7725223f82fd163b37917d1ba8b53730c5488444eb209fee8440e40f7304b739f88eda2619a0470b6d5190e684ffbbff8847ccff05 SHA512 2460938c302ad267fa1be1705d1a7b74b576528c6a9df9f186b01bebf4c296b0fccb50a663c7aaccee8562aea07f38bd4520d5a1095295578f48fbfca1b7f088
+EBUILD gnat-gpl-2016-r4.ebuild 4274 BLAKE2B 94386fd3a485575a83ef519070048620b523f1a828095f4ed10a956844e40c77bd836017ccea10c4e26c18494554c8a05fd74372254ba3120e8fc49b79bd2c95 SHA512 0e2e685bae752ae594e336176af1dbe6084a90f2b2b7f4813de62d3ca47cdfa20f7d1b3019eb9832768974c0b16a4aafc05bb168346c67ef16b3283ae046fdc8
+EBUILD gnat-gpl-2017-r1.ebuild 3871 BLAKE2B c4ccc2e03f13202ca0fe7c6bdecab7e17bdd28a866b088bc51b7915620cadbed1d35ff8dd3e134cee94b4bd960f02cb86d3154599c4779ed6daba5c7574f78d4 SHA512 7d8a81004f4332d4fed01a79edce3503cb1055797341f956f585935dedf54543eb4eecd72793c902a273c1b11ff9dea8cdab6e44ad074bab84dbe907f041c2d9
+EBUILD gnat-gpl-2018-r3.ebuild 3833 BLAKE2B 81698959e5e8cca3e58981132d0bee06473d935310abfebd808128eaeadc032b6b88bb13b529f653e92cf1e7009aaa3936f47c2aef4048071971f04a4921311d SHA512 1933f29978b0a9000ae9b5bb6cf38d186f912fce8d5e89a97a4c6386680ca02fdcaad71e18f36599f3d0974613c2de229776dbd2398bc2875e3c15885e8b7c18
+EBUILD gnat-gpl-2019-r2.ebuild 3578 BLAKE2B a2bb2a094b2c47620ca08156962425ec8210a27ad2ef712ab99f6e759a4a4f41a8b59c09230de8d12abebcce8b271c992c3a83a129b5ef93f1e8f71462f6c217 SHA512 7fccd20ad3b6cee151b8f7a4ea3b1d6b2d882aaac3a0903502f14df7d292ebf984fe72ebeffb8fda8f36288380669da5d4da6fceec795090a36eb01b9de2b833
+EBUILD gnat-gpl-2020.ebuild 3699 BLAKE2B e04eca37d7f42aa6586a97742d7c7cc05ff90450a166acc040c1d9a697826dc8cb021816207398e42dae67f5b287a4be1791d2019b4512861ff0aa53b1808259 SHA512 93fcd321a9c23a988e4110fdd59026e6e745dc3d7cb6c58a13e9169d639e23008433a20f73c568b6c57932be41d32aa19abbbe16a75b3496255c5799bb18fb5c
 MISC metadata.xml 2355 BLAKE2B 636a4b15afd94397bc6593691e65b4c6d0b5711a58d710225acaed13aa2c6d170d26ee7a316415ccdc407cb8cdb9456da39212b6ea88dd19da227e525f7403fb SHA512 2e84d7deba26724ee438adbdff8d99c61116ad91e9abc1ecea3343f7278cef8061ab89040bb33d832bd53fe66ab30fac1852f7c6d49700b3b9bcb33000ac50e6
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
index eeeeaf2c0388..d9b01134a7c3 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.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=6
@@ -67,9 +67,18 @@ S="${WORKDIR}"/${MYP}
 
 FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 
-pkg_setup() {
-	toolchain_pkg_setup
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
 
+src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
 	else
@@ -91,23 +100,10 @@ pkg_setup() {
 		GNATBIND="${path}/${GNATBIND}"
 		CXX="${path}/${CXX}"
 	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
 	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+		rm ../${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
 	fi
-}
 
-src_prepare() {
 	cd ..
 
 	sed -i \
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index bff11256c1f6..bdbf1fafb6e7 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.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=6
@@ -51,9 +51,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 
-pkg_setup() {
-	toolchain_pkg_setup
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
 
+src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
 	else
@@ -73,23 +82,11 @@ pkg_setup() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
-}
 
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
 	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
 	fi
-}
 
-src_prepare() {
 	CC=${GCC}
 	CXX="${gnatbase/gcc/g++}"
 	GNATBIND="${gnatbase/gcc/gnatbind}"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index bb4782b8d4be..87b416731cdb 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.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=6
@@ -50,9 +50,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 
-pkg_setup() {
-	toolchain_pkg_setup
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
 
+src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
 	else
@@ -72,23 +81,10 @@ pkg_setup() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
 	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
 	fi
-}
 
-src_prepare() {
 	CC=${GCC}
 	CXX="${gnatbase/gcc/g++}"
 	GNATBIND="${gnatbase/gcc/gnatbind}"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
index 397ec960074f..173c640d4b94 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.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=6
@@ -52,9 +52,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 
-pkg_setup() {
-	toolchain_pkg_setup
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
 
+src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
 	else
@@ -74,23 +83,10 @@ pkg_setup() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
 	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
 	fi
-}
 
-src_prepare() {
 	CC=${GCC}
 	CXX="${gnatbase/gcc/g++}"
 	GNATBIND="${gnatbase/gcc/gnatbind}"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
index 1e59a7091c9f..10317ef96f88 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -52,9 +52,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 
-pkg_setup() {
-	toolchain_pkg_setup
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
 
+src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
 	else
@@ -74,23 +83,10 @@ pkg_setup() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
 	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
 	fi
-}
 
-src_prepare() {
 	CC=${GCC}
 	CXX="${gnatbase/gcc/g++}"
 	GNATBIND="${gnatbase/gcc/gnatbind}"
diff --git a/dev-lang/gnuprologjava/Manifest b/dev-lang/gnuprologjava/Manifest
index bd8d67a9ef18..7909afbeaa27 100644
--- a/dev-lang/gnuprologjava/Manifest
+++ b/dev-lang/gnuprologjava/Manifest
@@ -1,4 +1,4 @@
 AUX gnuprologjava-0.2.6-manual.patch 414 BLAKE2B 6bad70e46f1c2e9bdf9e4ef45cdbc4a4074671de28188aac7b69082e44eed86ef3fc1be1b5e83ea81da52df5d1b218583ab7ae73fdeeeb8241f50e8d45c23713 SHA512 419b509abae773e5ac3f2d79328bb4014776cc7c6390b8afa2d3d7242afec41e92d22830ed1be3c15f3d007c9fa08b303b553d883b18e1bde1fe9af09a0c7644
 DIST gnuprologjava-0.2.6-src.zip 477058 BLAKE2B 00248df0b307b733595b585ed5b847413d5de32c3348008ce53bb4dab93bfc465531bd59ea224f5c0bc6a66c3186ff55d353a0fe88d222b490927100cbafceea SHA512 b175c74e754a7176f5fc38ea2215809bb9d60ec5b8852f99a48a72a0bdb316b33b7195ff5c85398bb63aa2e522d12dfc75e2ff3af9f89ff44448d2f73357f0a4
-EBUILD gnuprologjava-0.2.6-r1.ebuild 870 BLAKE2B d0574d90b6961ec6ca19e24e99b6f597cb862b89bc2a221ef4524d73afbe1182f54153bf0d762696aee620a43fd346fee616623e11d08460e252a455d55d38fe SHA512 4be4579753acd13e431439f04e5a415365d51bbcf583cdb405eec3e451fd998664fd1880f0e71a3005f84313473d00c77d6452092ca0a341b61b9cb105f502ca
+EBUILD gnuprologjava-0.2.6-r1.ebuild 870 BLAKE2B f148dec06e873bdeb9da63809b082972fbdcec546958c12ee9d284b56195217f0713d150c5fe49eebcc90f7c983a35937b890fbae6c6c321d01bc6f5c0d953ef SHA512 dab943589df310d16fca5c38e381fdc2926fe5cdad9c5011e7b205c1dd7b590392d6352644c11cddab437a0067f40b67f9956af5998a619ff9374d61e2096ad7
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
index 35e2d75a9edb..dbc6b257eff2 100644
--- a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
+++ b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.6:="
+RDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${RDEPEND}
 	dev-java/ant-core"
 
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index dd4ebba34441..1ed725164baf 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.15.10.src.tar.gz 23021993 BLAKE2B 8143f7703d07d4793521bbb6b935b87ecd87df451cc5d03370a01bddabc284e85ec94a16fed378ee9ac8e3f0d6999402025bb1d6afa3c1810c6343205c4eb2d4 SHA512 4f0ceff8dc035ec50cd0d136678573f4d624bca6a19293d5ffd75868d94d264291e44519bc450e40e8de486ee44d720555550eecf86cbae1f0d64dee00f90764
-DIST go1.15.11.src.tar.gz 23029946 BLAKE2B b937a8e350b6a30e71427d8cbc52edb73e11f055c16890c81ba4bf2f6aa90fd223f0af9517021741e791c22b78f840b3485ea8df4853865dceae354f4803c55d SHA512 52a107220f02197f07c0d3afef403c3762428c1f69107fa7123bc6cdf6b47dd4e65f2ab3979ad7d12a265b0c9bd0b66e6e50eb91f7fa994ba22882f117afe289
+DIST go1.15.12.src.tar.gz 23035406 BLAKE2B b5c79bb243b0052e7a3d58538ae734bbb38839654ffc0e1cf266d360c4f35ac1a8b02c999306a0c1bc598d6ec0c9b3326fea278163b49cd7becc820c7a129bd4 SHA512 9fdb0e74c0b4e8e5d8d45cbdb6f1d4be4d40549ef10629350856c3e045a82567a0418e949dfc229df7eea091ababec6b3e4e12b1bd424e14d7b10ef989e5c232
 DIST go1.16.2.src.tar.gz 20905135 BLAKE2B 35fccc72604bf8cc7b1b5677d995b88e3232559e32af51f96a63bfc8cabecec09d885b5b8aa4b2ba03c481254da20dbf9bd83387091931c08a1c5c180c071931 SHA512 d14858a75cc7411975aaca705e66145287dc96b4fac1b1b06b95377dc5e5d2762f060973744114f42c780b34ea4baef7038c94616649c2dcc5c97e261cefc6bd
-DIST go1.16.3.src.tar.gz 20912861 BLAKE2B da6752d06b86a5349a1bc11e7e4c61543fa75cf72d971fb7559c059b3d5d7721d4cba16ad63eeb00398c6e0c8b1b1d42f07c665182b4b70da83fe648f813eee0 SHA512 8808a3112a5bc89799491ed1aa1cb8744a5cc8d3cb5caa2a7dd711405266925093f90d437fccb66a48e5f994c7339077814f495a88baa7961e9cc9b0a6a838c7
+DIST go1.16.4.src.tar.gz 20917203 BLAKE2B 4602a20ced74dba86938283a736d5235fe5dfb34ae742c44cdcd7ae2453d4654ea5757d0be76b6687d1d34c1b8c32681c41398d1a04ae72d491ee1d8b296d16d SHA512 e1b64610e22e657d9c65094e679cec50f59ff338c0ef102e54debcced1bc032390122456451fffb2d26d45c6db2f55bb9ef7f56ce479f6f1c2c2e6cc49442d86
 EBUILD go-1.15.10.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
-EBUILD go-1.15.11.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
+EBUILD go-1.15.12.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
 EBUILD go-1.16.2.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
-EBUILD go-1.16.3.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
+EBUILD go-1.16.4.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
 EBUILD go-9999.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.15.11.ebuild b/dev-lang/go/go-1.15.12.ebuild
index 9d3bb807e833..0d4ac09e8905 100644
--- a/dev-lang/go/go-1.15.11.ebuild
+++ b/dev-lang/go/go-1.15.12.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.16.3.ebuild b/dev-lang/go/go-1.16.4.ebuild
index 9d3bb807e833..0d4ac09e8905 100644
--- a/dev-lang/go/go-1.16.3.ebuild
+++ b/dev-lang/go/go-1.16.4.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index ad9ce04a40ac..5f0efbde2dc8 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,5 +1,5 @@
-DIST janet-1.12.2.tar.gz 558788 BLAKE2B 0cdbc33d968b0b589cfc0ccd6dd5ffffe23932daa48e67c035d67d4bba0519083503693be470498c1f6d2811b164bfbb3d2fdb35967c6bd64808ec87f1fd9770 SHA512 bde3d516b0a1c55ad8edb2dc701a3afdb5e7c2bd028b132598d1a08796aca5f17f71dd2c760192a9703a07adb3450a7af6971611ae57005eafad1b741b0b69a6
 DIST janet-1.13.1.tar.gz 584998 BLAKE2B f1bfd9e62dde786127a1307d38f48fc7e75b9fb09f009f9d01eeefa593b67c2469e213fd366fac7c52e0372e61b1a9afdb558e8a1be1ab2f4f538b5fb39075f3 SHA512 8022ecbaf7680855611202a3c17b8e5f6dc61a9302508c9de5312dbd9e80d40c24786bb5e8ae653ab5a7b00191a2d7c44cc3e305d31245e3e8c53be0e1c80372
-EBUILD janet-1.12.2.ebuild 1748 BLAKE2B a03cc9399f248d6050bf59f6ce251fbce076a9276da10415cc13c58cfc07e44d3ac6772a7c86394ed83e4b78063742d2f42d7c52eeb47227b8c9d7ffd657cf56 SHA512 ddec46f26a72ddb59c9bc5f46db601625afb1764ebeb5826221ab4d89634538f6d840e622d292bd8ece3a4577c31b5a8a7746fd88f8e25baeb8e2b1df3f6c9f8
+DIST janet-1.15.5.tar.gz 601033 BLAKE2B dfc8c2a2d238f2554aae667f706e84905ba15c732fa2f06b3c537f08d064375dcb00043117dfc56328365627e2e8f4e2a8f171731d9d6bc0d48206cea58f127c SHA512 ebdc090de6fbea0c94f0618957a4b36776fa0009298df77b279b79064d4524e73f42723ba2c315167cb6f3a40f2a4dffbb2a865fa2d479ba196aa9f0aa24cbf6
 EBUILD janet-1.13.1.ebuild 1748 BLAKE2B d33aedc446e1692e0c39aace488070501e3cff1efff6545fd0d43710efa16d7a5a5cc52d0fbc360756b04d78dd8f015c12526cab986bad05bd75de5326fae923 SHA512 9d41ab1921792cfc549d1bb8b9bebe3b8080de6ade08ca189ea8422bfa3a7106e722374b31d240caee2d00656b85dca99bf69608218ee20e2c2677b43083b09d
+EBUILD janet-1.15.5.ebuild 1748 BLAKE2B 50067fd265f5e08344fe43f59628c1a5b9c5f1a735f85e9a1d8eee680af21443915d66120dcb07dcc3c317e20201168261bd9b65ae883fcfaae74448d6ec746f SHA512 957db602a769368862904df84deb119eea06b70fe46c07a41af3cef0bbe3bd66c6dc64885440da73fe44572fd522cb6e0b5a8cd5f9560c29f228802823cdd74d
 MISC metadata.xml 990 BLAKE2B 7e8a261e9007ef46da4944eb81ff4ea35cde6c9c510e63f5407215974302fa0410d9c38ce1356fb7ce1648c81e0c42cb16dd74b46c2d9f277c7bf1044c5a44e3 SHA512 35291cbd14a89e3ce9b6ed31eee97253dcc7e82f6a6310f669449518778eb137a1240d04a55e5f30d5de479c50ca7eec6e0bee5e64d035e8e0705746de6cfe3d
diff --git a/dev-lang/janet/janet-1.12.2.ebuild b/dev-lang/janet/janet-1.15.5.ebuild
index 574832c06825..49f4ff2d82f8 100644
--- a/dev-lang/janet/janet-1.12.2.ebuild
+++ b/dev-lang/janet/janet-1.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ src_compile() {
 	# janet_build is the git hash of the commit related to the
 	# current release - it defines a constant which is then shown
 	# when starting janet
-	local janet_build='\"1.12.2\"'
+	local janet_build='\"1.15.5\"'
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 700e100d47d2..f1de56062df8 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,5 +1,5 @@
 AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
 DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
-EBUILD mercury-20.06.ebuild 5174 BLAKE2B 9ede33b7ac5079ab1aca5a405b026b71afa87187ca99f740aca5d2ed3a92f0c80269a73c6c56274111d1cad2f7d774e0f08874954ece3226325451c9c9ae701f SHA512 a2f4f7bacc778835c4c0bbc1b6a84fa7272da6e3698b8774257575589923c793c133274c6ff57d1b546ef3fe4b8491f6af2a77b961fe14e2773f831a0040edc3
+EBUILD mercury-20.06.ebuild 5174 BLAKE2B 2ba70a541761a17305d6cea9c36919034336fe0f61114904e1070ef23312ac1f63277a764bcad6235e2baa82e647032b276d8a9f1854df0b01867617e798903e SHA512 8ad6ca07eac5d2deb7ab6521f3d64fc749ca75a8700900417496d1977ab333d3814cefcc01228924e0c55932fc5755203e5bb49733658eccffd6fac9bef8b6e5
 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf
diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
index ce13209041b4..be12f843b0ea 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -22,7 +22,7 @@ IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
 DEPEND="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
+	java? ( >=virtual/jdk-1.8:* )
 	mono? ( dev-lang/mono )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index dbf4dcb3c9a9..6d6487167a02 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -5,4 +5,4 @@ EBUILD moarvm-2020.11.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa8
 EBUILD moarvm-2020.12.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-2021.02.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-9999.ebuild 1736 BLAKE2B 9f434f8561c55716165952dce8e35bd3659fbd0f3a42f688049e023faa0f10c4aa245ca810279ae80527c4ec5fe5c514bc5ae534aa30e839693657ce68fc7f9c SHA512 5867e2ee90401a86cd0341d8ab5ae75fecb7d366d88e1269439248686942b5c1855e45857b4388491631b26361aac3b0495d7214158931e955655a34d557fada
-MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
+MISC metadata.xml 802 BLAKE2B a2fc329ff27764a800785617bf71bdb99f764c3709130a094ac398d99aeef1414c1188d55088ada2f41eb4892709ef681d47b9f64e27a0426d5ec0cd8c90640e SHA512 2afbbc8899857a4bd3583f2bad121fd68208dfbdd4d0852bfbf28860e45e49a4b600ee74c254f7ffa782e8c1e939d56744acf82771a49fe0caed7e31492b8c60
diff --git a/dev-lang/moarvm/metadata.xml b/dev-lang/moarvm/metadata.xml
index 544cc2f4ef43..cc052b528dda 100644
--- a/dev-lang/moarvm/metadata.xml
+++ b/dev-lang/moarvm/metadata.xml
@@ -5,10 +5,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
   <use>
     <flag name="asan">Enable clang's Address Sanitizer functionality. Expect longer compile time.</flag>
     <flag name="clang">Use clang compiler instead of GCC</flag>
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index cad44fe35924..8402d9888cd6 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,4 +1,4 @@
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 DIST mono-6.12.0.122.tar.xz 292266176 BLAKE2B 07043c5fbca33edf64ebca0392b47af9b9ab502be772efb5afbe5ec9e8683b7f4e96a305ee906dff617842bdba2819c2abc130d7aff23b12779f403bbd88f3bd SHA512 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
 EBUILD mono-6.12.0.122.ebuild 3278 BLAKE2B 1f134c86a53be3cec90ff3ac2543aa7e2ca8cda2d87c6bbbd9bb7025d7cbdfadff52c8e9ac052559f5f6123e9a4784e2c2260aac7e4a9a6da630621762f8f367 SHA512 bf55e215f1323b1ef56a1e602b9c5f210dbc76c77b88cc4b87b44c572e59d4c73cc394e72f0add070b42e58d7285af071889a024509c70d06e3a8c4614a4a2df
-MISC metadata.xml 669 BLAKE2B 5b6d7b3fbe7c900b27f715b5340c9ddbc86802574e2956ad99af087645f1505c122bcd2a3f4cf11d905aefabfd1c0612acb1dc6ec0dc54da40c851861776f697 SHA512 cacf20f165ab9af519b261468e254867f763199a823d436268bf3abd6b69ece502eb33d729bae8925e2096a8620ea30e42fe939c3aef8088022c94f2c15141da
+MISC metadata.xml 581 BLAKE2B 7ab39987d9ea8136c56a79955e558b4f704f75e78ce264f0e34eacf77d4e5d6ef1e5c3fc3c57bd23290f28c3c0843a0b9a803e03379a8d22dd95b5da559d8205 SHA512 96e537a5fb9ddb0c13fc89aba49c9276585005437888cbc64a75f7f60fb3da5def1fd985f3fc6f047e3808f6d55431636be438bfd665f91bf51e77c4a7b4899a
diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index 7fb3820c3aa5..bbf56c224647 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 		<flag name="xen">Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 6774f78a333a..935df121e4f5 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -5,4 +5,4 @@ EBUILD nqp-2020.11.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc
 EBUILD nqp-2020.12.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
 EBUILD nqp-2021.02.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
 EBUILD nqp-9999.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
-MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
+MISC metadata.xml 516 BLAKE2B 82a24b38f05cfc436b30a042aa0aa16f638cd471a3ca51d1c0f6c096387a83d95a4e4ed7b9ba3f0f84d3faa630dc6e4d5b6fa884cf76aaaa67aa544eeefc8ae0 SHA512 c96c7a42e554542060ef6b83b9a44ac33c425748b788d7ea438590a49346e06ee71decc29afaa72b758fa4a963e1f0692eac24420141d6e016aefc08f97881c8
diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml
index c4bd99a587e8..efc6efdf2dee 100644
--- a/dev-lang/nqp/metadata.xml
+++ b/dev-lang/nqp/metadata.xml
@@ -5,10 +5,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
   <use>
     <flag name="clang">Toggle usage of the clang compiler in conjunction with MoarVM</flag>
     <flag name="moar">Build the MoarVM backend (experimental/broken)</flag>
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index de068d30dd5c..1fc59cca06b7 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -6,7 +6,8 @@ DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d699
 DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c0e653ad7ba27de441d26e049e62dc67b17d58dfe5755f31bdd157e349d47fd46a98699207729f8f4f747930ed1064ba2 SHA512 42ed00f5f6be40af59e02691ff439a048cccd96fb970cca0976209faa921af98a773cc4cb1466e164328350d58cb46950ffa8c6f2fddabbeb3e8819349b06849
 DIST perl-5.32.0.tar.xz 12717336 BLAKE2B 4abad9f1ddabaad5f2bbfe8ab6d061aeb8c558e458d4bf1bcf737a8ecc1cf20f7dffaddd0bc867578b457787ec284fa81be3fae1edd7f72d58aeec7b5cd744e5 SHA512 1540247415893bbd94dfeede7b4fba6052688dc0bf27ced817f448246fcdc6e9a6486abc34577dec5b00bf02ed607b2d24ccd4977c3b3c51e8e6edfc0b81c760
 DIST perl-5.32.1.tar.xz 12610988 BLAKE2B 9f89bcf9cffb245a0f2cb0afa17c25f092c84cc2f29bb1c744294c2f0393c72dc3beb9fcbe256cf252677b33bc594b294b3f6a4774ad9e30b771aceed1f4f147 SHA512 3443c75aea91f0fe3712fee576239f1946d2301b8f7390b690e2f5d070fe71af8f9fa7769e42086c2d33d5f84370f80368fa9350b4f10cc0ac3e6c1f6209d8f9
-DIST perl-5.34.0-RC1.tar.xz 12881680 BLAKE2B acb26d65b3a439676cb7cf9477d2590e33f24bc4d0f7af6b2069c81aab2c74b047ceae349ef58fa49ce2ed8668cf7eec1922498bd2db144d08968a4fd1b7d9a3 SHA512 fdf686349c00f637eb95691efadb5042f15bce8ec1174595869815761e779f616504d19d01d52a6d13ec444974e7d90bfdb15a83aa36d2acb840bf1ff7dc97d6
+DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
+DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
 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 20690 BLAKE2B 036c53922ed6247d01828cf6ce7f47be06877c0e9d63158e37a9aba1f35c3e717c3f0cbe6fffadceb513a1d34f2ef300cce7e4a98ec601e359d9414dce882c14 SHA512 17793920606af30aab84d2300dabf07a60147f94865124ccbb7feae94a309768492364ac5b26ca8b0e99d1860856d6be54ab9a0812aa59180c28ffbebbad1d6f
@@ -14,5 +15,5 @@ EBUILD perl-5.30.3-r2.ebuild 26146 BLAKE2B e0756d8250acfd3dbbdeac414f2515270820a
 EBUILD perl-5.30.3.ebuild 20132 BLAKE2B a244f590c7be7a1f078e8117d3b2745c4118c8a7ec264caf950a0e4c051090b38d4fae431187486fa4b527b7a5ba1cf7000134e9cc2a25bc1a8397b72bd882ac SHA512 d32292624e29ad20f41a9c688b663297246c868455bc4c3d079b12ff90f4fd89f88623e3ca270c58e92ffefe1fcdd6a38910da18efee5954fc1d24de0c104a87
 EBUILD perl-5.32.0-r1.ebuild 25913 BLAKE2B a97f41da180ee9e0beeb163ffbbc1c1f944d8dae32954603c9a3a9bf24d9623db6146b8440917dc891ce24ddb41c6c782e04630e4cfa68649f526d7a3e57def3 SHA512 1223ca91df30ccdc247f8a9659376e4407920c1223753b00da91859935117f5361c128b3b1f5d38596f70a4d0ec0e6e6fda58f1b135525c67183fe906bbb2cd4
 EBUILD perl-5.32.1.ebuild 25766 BLAKE2B fdb6aa92e7f88c273d918cc11ddf964ce9baa4b832c5dc7f6f2d68d1cfc6ee5121ba665747f6550192ddb4d3fe4c76be67809db333ccf6a4ace34b1022fe0048 SHA512 21b9d98f4166472dc869f8ef680fd09635e78a5b6e69fe5d042430e362ec25852e045e615dfced0e3fdf3328ee5445c337eb06050e55356b7410a4a8ed6892a0
-EBUILD perl-5.34.0_rc1.ebuild 25682 BLAKE2B b8ef0beb80ecc1c9f561cf0ff5ed183bd354815789117a51c5a4b8f13ddd8841e06a3e96d5a53aef5e671efcf37a55e5dbff3112d35d5d4ae75d70a0406851ce SHA512 80b072dd3805b832321c4b56758899ef72cdd664f389aa7f4111eef0a7c4c2f829d689019a4d3347f8ea42abcb9137a6ee6373fe40907d028388ad4640900299
+EBUILD perl-5.34.0.ebuild 25672 BLAKE2B aa0ba6b15d444973b0aa822933db672b136fb0d8601af1772f7593ae7840a63b109bd305fe9436e7be4c2262ad2eecc7bff086a8c6e992f560016550383ebbaf SHA512 07a66188031dcf5f112329fbe90aab217d36c9b46090b2b4119267e41169205a3740ccdde289d40e658761af345c14e091fc792f2be3bd4c676040280fda8df1
 MISC metadata.xml 430 BLAKE2B 65949096d565c5754b25bb708f80ab17e95d21b252f6a3b7a1104b01bed26db1f9351c100d1cc59cbf4161d662bba6fb17d232d146165e97f82681c410feb98d SHA512 b3aaad1820fb62287c8da2806ad385e1ced8d8d2a05fbcd2448214120a4682d503c3dcba60d03a5d02cd8e1b4f5b13568759a096a5d8a3a5ecc5c35c5680b670
diff --git a/dev-lang/perl/perl-5.34.0_rc1.ebuild b/dev-lang/perl/perl-5.34.0.ebuild
index c9b82bfa8462..e9e2eebedd4f 100644
--- a/dev-lang/perl/perl-5.34.0_rc1.ebuild
+++ b/dev-lang/perl/perl-5.34.0.ebuild
@@ -7,8 +7,8 @@ inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 
 PATCH_VER=1
 CROSS_VER=1.3.4
-PATCH_BASE="perl-5.32.0-patches-${PATCH_VER}"
-PATCH_DEV=kentnl
+PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
 
 DIST_AUTHOR=XSAWYERX
 
@@ -53,8 +53,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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS=""
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads minimal"
@@ -83,19 +82,19 @@ PDEPEND="
 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/Archive-Tar        2.380.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.280.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.101.23  corelist
-	src_remove_dual      perl-core/Pod-Checker        1.730.0       podchecker
+	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
+	src_remove_dual      perl-core/Pod-Checker        1.740.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/Pod-Usage          2.10.0       pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.430.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
 }
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2f36f4d76209..20290b52a6d3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,12 +11,12 @@ DIST php-7.4.16.tar.xz 10334672 BLAKE2B 685717509115e9607fb8ff4ae439bd3b70e5c1f2
 DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e9e4756cc7c1403c67e152ad3461d84915e4f542b1e558469ae3143721c6d7ec25ef03c3b4a6142fe972bd775 SHA512 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071
 DIST php-8.0.3.tar.xz 10755796 BLAKE2B 5dd6afe985b4f5e33f456f05edda0207d8dfffbdc35d0b2290e1bd30a93bcfd94d6ef23e7d2c8d77b774a7ff95f49832687c75593d7ab38704b60ba3d9331598 SHA512 9b3631fea5280ed11c14a3ef1badb3da5b8ab19f29faa6b828ab033008ebebc487013d74d401d10b9cf21f354cd81100ba83562f3f080e23220ad38c02fb5a0d
 DIST php-8.0.6.tar.xz 10764932 BLAKE2B 9ab23dfcefe2c94a88184fbb3e18267c38fdcabeca0e9ba12a616528895f85790b1238fdb6e0578db2183b6eee26f26d9d7b744b7344495ea20a6e58668136d1 SHA512 4915b9b5024ce1fb7bc3ba7c1a00831841bc970ebb68b6b1e6a00cbec4d8dcbbca3ca043882ffd9c4719a988d08275f77f9cee07ff3d45a71402dfc51bd31e04
-EBUILD php-7.3.27-r1.ebuild 22676 BLAKE2B a742c4d522f849d78050b07674a7d8979a30db1d387dfa60fa76092f7edbc5c901a520e229c21313e5e8a3d64acb4f6d7e1ce690b106ae4a588e89f5053d19c6 SHA512 9bc55c0e357e71cdbb62b3c4875ade70439ffa504c6769d98392e04d00535114ea80afcf1a8ee085d5b657fb898f27b8c14e4f116e5a96a91c14ba8dbe505357
-EBUILD php-7.3.27.ebuild 22698 BLAKE2B e7b354b707d4346c0f2a8c4c2b8762f0a7b4b020029dfd4bd840e86d01e68b9963bdec2931545f09dff83d7f28bf5920e9c0ae94a4d686b5c79f75cb27e670fc SHA512 1ebb1823a4e54686f50eaa583520285d353c71a996e13644b79f6bed9f270b183ac6fce778b296a24445f5b03aa6c2e5f1a277c0d04786370e9154c691e503ac
-EBUILD php-7.3.28.ebuild 22675 BLAKE2B 3e3fc431c6b3b11fd42752973ab961419b26b45faa3527af5b4f84d99e44b7a901ca11baf12c0d6fe6617dd7e7e7db70a9578eacb6b117a464ec32c9da4c7be7 SHA512 4793a10645a58321361d6d3a61558c6185ebe693536d24ad998aefc2ea9856777099b3289415a417d2f4a124271bec8b3c63524ffbb2b93c94f6e5e27201b173
-EBUILD php-7.4.15.ebuild 21407 BLAKE2B acc864e83f27a5b62aaa5cb3848988746fd90a147e1451764ff682f3316084e8e61a5bf10c4c5bf75c34817ef210382709fcbb72aa7195c090d4c334cf02e08e SHA512 60cb52c58d3a3f52e3adf6691fb461767a5e1b195a20179352a99be426c7b78f84c32908f8ead9d2b377d7649fa3ffa7e7a509b50cb47def2e7831c7b89c8174
-EBUILD php-7.4.16.ebuild 21385 BLAKE2B 5b5e141fadd137d86d3400f9901aa48b4063a1270a75a9ec52a990dc07bbe9e6151e9d2f4e17307939963dd9c981879748a7a0b4fd95f19f311ba4bc5f4a4a10 SHA512 a5e0cf9953d6575a189fdba149f277a41002c63020dd61d681d47e4548be8901438db6663db2795579467b04202f5412e1416b95c52f3e403c3bb65993080cbc
-EBUILD php-7.4.19.ebuild 21384 BLAKE2B 358a22ebe0a2828a7df5595a2c471eec64a56efabc1aae90e59c716f853efbede0439b37819d4647f95aff93d1c6f7ff975c09c232fa9777d6eb1e3a4555b059 SHA512 540912e4bb1cf7a3ad8d2db5242caf6fcaba2195c7474ed6c8acdafac41c95f1103b99fd9a058fab6ea29c18afc31483cdb1600df80b77677e0a3e2b182cb30e
-EBUILD php-8.0.3.ebuild 21331 BLAKE2B f98711ee86f9b647b07defe4409a4daaf2505fec0a1749a3bf306aeb97aa1714288340ff8a32c8e48e081d25efc7542e003f65c0080e5c40000b2dc0f81129d0 SHA512 49b10d02d3c055956f9e6587e36a2f5ab6c3a4c4f2a99298fa96255a80f2b0bc3bfcb21c39b56872cf5595ece1f6dbb38955e5fe4c115a149cac2a7f20b43109
+EBUILD php-7.3.27-r1.ebuild 22685 BLAKE2B af0b1509baee5cacdffcd796d180daba3c674e4dd5c7701db19501079d53279d2374053d9bcbc28ec2bf67d8fcb8cbc55e68f1863770ab7a5f86c7550944216a SHA512 b9e6b031ab186d56ac2aa9672406b0e998ee4a12af034029b4bacdd539bc612a0664592c896dcfcb9306249600bd6316b033179f599f3c0e4b56dfe02336c0f2
+EBUILD php-7.3.27.ebuild 22707 BLAKE2B 4d907736aecac25879f7d443587020e3aae77d034908b4b7db119018a4c9e4293d6232e94e55335679a5a26ca8d11c949fb8566b304ebdbfe0ed1fda69911fac SHA512 e9061850e62194673e652c8d7066d8f06f34f90c7bee2cf144ce6cdab918c136fa3816a37ebea8e50f976b4d721937eb2e4a6a39c50c5b70b98520ffb0e3ab6f
+EBUILD php-7.3.28.ebuild 22673 BLAKE2B 6c64c471608b337f4ebd5d07a9cec58a38afdf3ca5b64d094e4e1a37040dc4f95331c1fb7bf8f3a8c5d3cf2b0f6b215b4b342fecb162c69bc29214cb250553bb SHA512 49b0d559c6999719ca732d9a40c9154806092083b7da2e5a11ab33718b638cb774de3a6af81949c408e99ba18a3720c4145022221921f3a7bd84572ac28c98c0
+EBUILD php-7.4.15.ebuild 21416 BLAKE2B 56e10a542a27b87bded2c911e84914719682d56b36a89a6a46a8dd677a73417ee6f8f34679807897242b7104679a4fad03b81c78aea4ff3fa48c30602554118f SHA512 056ea1f7bad51ab3c164dbce37b1b99c978f439350a8931b0518a3d95f52db8ab740f12372ce60fbd42a1ab6173cc38f88b2714a4ca4f0d5958597cbc6cd588b
+EBUILD php-7.4.16.ebuild 21394 BLAKE2B dfce0f70141772d50699a7b734874dc4c0484a5634e6d5f580f6f93d7befee01af5ba5a80f03697d68fab9a9b3d6c75739cd0d10e4e72d75bd01b29128986b65 SHA512 a54d13edbe2bc6522dcc9f87d2d9aada1236f73656353b4cc48805e08dee62dbfbe620c24bcc0aea3b48f16e38adadab1c93e7f07fe8d94c1a8bc8c58f3622ab
+EBUILD php-7.4.19.ebuild 21382 BLAKE2B 27074fae8c5d1b0727acb1ca1672b0300edb30483ec7fcc4b0102982e8ea6a31f4c5f55013243c2de3e3192864ca466cbe1ac589689204ba976eb85cfae7db87 SHA512 afccdc44f0ddd1c5417c8be6655a947508b82c8cabe57a24174fd03eeb951b730136379c2a0f978b10993fa4b0a7ef6eeb95b398298ed4433db86b4e2d2ba872
+EBUILD php-8.0.3.ebuild 21340 BLAKE2B ce58fe6fcb12205c4083e83e98e6fdef6516a39b5e95e4b070023f5ef4e346567ae470c174b2c0f652a96516624ef070f62ae200e88933b25c24b5ece5d3cb26 SHA512 13c8401d69ad89d7445d40b3d1fd7f455dae2e017b121deb321bf60e949116389e635c4e7401264b8c5d8bb584814710bd6267aa1c6515c1adf4f0c86a5c3d36
 EBUILD php-8.0.6.ebuild 21328 BLAKE2B aa18a9946ac756b200a4b1610ec3cfe8eca05a454458dacb00d8d7138d3933ab73c6c7db9c72bc29b28b470df5eef2d7400354d38b5404281ca33a0f96b36461 SHA512 703e031df5c14982d8278ff824cb1d9f79cb4e33ec9c70de2475232f65dc92c0b4d0400bc60f90902a6a8ad1c769d29a690fa08a3eeac1a99b321ae5bd9e9a0c
 MISC metadata.xml 3268 BLAKE2B 4abc96d858186ab5bc6f0797fb3f1cf7f5aaa0b07a4652dcc16aa65e197bd73803f6bac717084c0c9a194e7da5b6632523105205011a0d39221aabc16ade8e2e SHA512 1413edb5293cb93ad8f94376f11b9952ca6369b667ae23baed56d9cbaa68cb9cfa5a80da7dd7184ba84f08d5a4054068da1c10daca81d1730e7b6edebba8b29f
diff --git a/dev-lang/php/php-7.3.27-r1.ebuild b/dev-lang/php/php-7.3.27-r1.ebuild
index 42644970c99c..ac0c6358d443 100644
--- a/dev-lang/php/php-7.3.27-r1.ebuild
+++ b/dev-lang/php/php-7.3.27-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-lang/php/php-7.3.27.ebuild b/dev-lang/php/php-7.3.27.ebuild
index 22c91bfe9a92..6c296df19104 100644
--- a/dev-lang/php/php-7.3.27.ebuild
+++ b/dev-lang/php/php-7.3.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-lang/php/php-7.3.28.ebuild b/dev-lang/php/php-7.3.28.ebuild
index 247935d4723f..e95cd1b6fa44 100644
--- a/dev-lang/php/php-7.3.28.ebuild
+++ b/dev-lang/php/php-7.3.28.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.15.ebuild b/dev-lang/php/php-7.4.15.ebuild
index 66581ae2ae3d..48a329e17d5a 100644
--- a/dev-lang/php/php-7.4.15.ebuild
+++ b/dev-lang/php/php-7.4.15.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-lang/php/php-7.4.16.ebuild b/dev-lang/php/php-7.4.16.ebuild
index 754dd7ddd62c..03691d940da7 100644
--- a/dev-lang/php/php-7.4.16.ebuild
+++ b/dev-lang/php/php-7.4.16.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-lang/php/php-7.4.19.ebuild b/dev-lang/php/php-7.4.19.ebuild
index 2b0ed6881b16..83528047016b 100644
--- a/dev-lang/php/php-7.4.19.ebuild
+++ b/dev-lang/php/php-7.4.19.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-8.0.3.ebuild b/dev-lang/php/php-8.0.3.ebuild
index ba7effdfd07c..a3c88c648060 100644
--- a/dev-lang/php/php-8.0.3.ebuild
+++ b/dev-lang/php/php-8.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/rc}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 72d55ac24758..f8566e45f6d7 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -16,20 +16,30 @@ DIST Python-3.9.4.tar.xz 18900304 BLAKE2B deb69a4e821163b3cb64b6fd5b3dbd7a8ad4bb
 DIST Python-3.9.4.tar.xz.asc 833 BLAKE2B aa261d09200f150522ae9fb15e75f3a927ed48d19561fce9a7c8cf6a34c21e89b0f00ad2d619ec0bdb75ccf5c5881229349bb0248642ddc134711e8336ef0731 SHA512 9cf2909ebd178cea5a6dee9f6a8622ed91c33b943f1e7f7dcf0f7ae67f552e767393f833e9a4e1e62ff059fb265582d83a85dafefbb10df7ae3da0b73669d4cd
 DIST Python-3.9.5.tar.xz 19058600 BLAKE2B 0072376ac69728436ee422da58c1680170cd60c76ac7d623d7a29c9001e6acace1a8d75a1805e65c9b11a30c55c9e67ed66712ec22b0b94ee6873995c935141d SHA512 7b581af1b3e73695f124ff6a3a960e22104153a5d920ca930c046f42ea313b1e7ec77e39876db2bf5d5da6d7412cb072ff8ae7814dda12c14f9da6c570fb0995
 DIST Python-3.9.5.tar.xz.asc 833 BLAKE2B d044e2019edc4854db22eebda182528e88a0c4d71cc17b78e603b43191a882f176a9fa46549845ee09ff9aa56ddf69efa008cd7ae3040b24fed7956c52bb11e9 SHA512 cfee8c161447544d6f18c3490b96ce12c8df5e9b143fca09734066f3606abe767cd7b4d05315c691f41c0e565d9585456774c10770ffe2ef7983a911bbcfdb83
+DIST python-gentoo-patches-2.7.18_p10.tar.xz 30436 BLAKE2B 24610a09037ce43a4cdb9a97e44e731fbf5215a63c55bacba8bb00c543bd3f482657fde6ed4b739bf5225ba123cc9960c8c842e4742e0769ee7554c23129f85b SHA512 f2b6b0cfb452c32bea07894b9365941545539aa240cb97660930578d8f1ae1744eb137c1c46b1ece4d1a874dded98395049145d3d5ee473bd1c67bc1dd92311c
 DIST python-gentoo-patches-2.7.18_p9.tar.xz 30188 BLAKE2B 4f9f80e0a967a980d247b50ac3c38419e70fd2dafada4e4b5593935915b17f09aec1a88b0baac58cbc0c2fcf73eee6dbd5fa5f378a8e3e1923a0028c2c3a1f5a SHA512 874e88142570fd62437b043a2763b32667dfd9856a7cc8884f5d3c09e7a8520e1cdeb5eb5b6bbb884fbc3bfad03abb83e1c260969f4b9520ce99334cfaeb76fb
 DIST python-gentoo-patches-3.10.0b1.tar.xz 8116 BLAKE2B aba4856d2463e57187680780cf5b5ae24547413acb8c2439c03ac9a33d4908b547cc40e3d9752c6a76494d47d2b824677e28b543a2fcf8cc1913395d05327f1c SHA512 b62b3fb00a76e3eac842e45d10b3d1cafbcad20659db54e11011d9dfca70c34e28bf187fa7fcdbc4e0bdcf66efbb7f8a6eb2a8d1b28f6e8c1e639e63c203f215
 DIST python-gentoo-patches-3.6.13_p3.tar.xz 17640 BLAKE2B 255e96f61ad8adb7fdf1cc9f11ca99c8368601dfe9bab4c96adf1e77472dfdf365a6ce197ecc72b574849e2a6235063d63558711049e9e7407862871dc0f2f20 SHA512 7b9a39cd65129c495c513e1b8c259a88194b8877b891cedaa5289bedcc44dbcb5e63e3b9922ef085321e7f4db73b5a5090d30725b456491a98d7ef40b85601eb
+DIST python-gentoo-patches-3.6.13_p4.tar.xz 17896 BLAKE2B 768ed3860766b212d21718d2f83fe2852dd297aaeaa2d76d93357012513b2aa66e8ff8fc8edf7375ae10ecf0864560e7b4df168f916cba06c67e329612d404f8 SHA512 7ec640280244c7fe8e5c5b3e8c7fd396ec37b920fe1a77d99e85bef20bc335cfc0bf818c58b8f203c15ce343f50d4b8c7ab7591ecfd21380c9cb15d87ed81ca4
 DIST python-gentoo-patches-3.7.10_p3.tar.xz 16804 BLAKE2B 1db238e4b928332d459b5f3c36ecb7f3bc3d3b754fd82e4434c91843ef7574306aef044df9a2644749a17b14ce9fefcd3c3dd44cafaa4ace0b7dc62fb66e73c8 SHA512 61a262a05d1f8e9b08875285db989160362eec66123a15345dd16b8c1f1161aeed31b20df8f69d27ae71902ae2e678328b82e511881d9a5560932619234bbe7d
+DIST python-gentoo-patches-3.7.10_p4.tar.xz 17076 BLAKE2B 628d82f5fc24ee68b4d529ab6d2fcaf7361d55a99dccd699a2fd027e86a731e641ff1573c7639d3d513b2030f8e8629adab84c13a9dd1ba5e2a84bdb16e92c44 SHA512 856ff2e3a73d56888bc1a3b2a28e2ca284a2a40ac3df4d060616fee47e95052b535e697d1d77c58ed850da105c7accfe3093a41492e63f6642349f7a6c80a3ea
 DIST python-gentoo-patches-3.8.10.tar.xz 15180 BLAKE2B 1f8c57c6ed8d49c5ff42ecaaf19f470567db7fc68ed95eb44a89e9e85a542c085708207f02a1e50ebd7e6fc5e876e232ccd47f49e7653d338ec0520b7dac1a3d SHA512 65e3ec0a0fd49c0c6e96eb07c98b93ce5168e430bbfcd1e62185f6df6bd42fb1a5b5752cbe8bde93101510c0cfd37e604dde40549703b1d1c0e37d24cc327472
+DIST python-gentoo-patches-3.8.10_p1.tar.xz 15504 BLAKE2B 63bd3e4928853a80a57ff922c42c434990b38a5c1dc639a277b8dcd01dabf1e0ff745750859b2ee47d30f84afd2bece81e4ba72b89a9ec690300de42e2a5f590 SHA512 955f7647bb05572a1f77cc8a8c35b7690ae914b9b22d30da553502ccc018b4134a7b647dd088b8b75c46a6971bf64dd750e47ceb1b3b219dd58260bf7b67860f
 DIST python-gentoo-patches-3.8.9_p2.tar.xz 16600 BLAKE2B 895eebdfabfe9cc4a30d87255112033b506511a8def7cecb03e37b0bde350f1c4b53f06a7e8ead53218c29e2cf4866f2ddfc9d30a07e9f5c67e4c7c271c18cba SHA512 5751c4bcdd1f637f9678d3fa3455c701b2dec051e12d5a1fa6468d7745c1387fb0485672e53dc619b4244435897f21702699c64b63ad9a0422ed91edd7fb2491
 DIST python-gentoo-patches-3.9.4_p1.tar.xz 14472 BLAKE2B c8bd49c2eb77eb00377e6c6e63a2f6b1108a2c8d4eb45cc943ad2d0a2b4457e00002f90d2597032716af5268f33d24902d4634cf8e98778c1d15bf8dda5d7215 SHA512 9a12c1935be31b1663e4ab6c1f7aca51ba62ef4033600885678ce436ecab688e2df82742125b4885b1cb8da9c68140c5ca4ee1684360ac87d82c6491bce5d0a0
 DIST python-gentoo-patches-3.9.5.tar.xz 8820 BLAKE2B 177234776f00c3efa6b76fefc1ef0001225ded1dd8ba916e3dc8498a7e845467bf387ba8a4f82da713a51bff627420a084f6627218863f70e1273cce58ca7252 SHA512 37b7e25a1703184556f12202da9cba1a8e2fb1c059d75195ef2997f55948229f164642a580e33c59f5877fe36d4c62f1735f95df318b36d92c528eb98f42e55f
+DIST python-gentoo-patches-3.9.5_p1.tar.xz 9124 BLAKE2B ab2f51c2d10c679022b563efa8b2494499d8d69b7617ec5229c3af546b1a9589e8aa064e9c025e19f658a316fba4134086ac8f357de97042288ee7b8f34ba9c7 SHA512 16da4a4736acd0ceb263766d14781a034a374372c7ab603a966fa364350b28e8c168f2e38c276d8e03cbdc2f3f9dde691fe959ca3db20533b036cc664a3cefe1
+EBUILD python-2.7.18_p10.ebuild 10287 BLAKE2B a39e37ae85598772b3d132e5e63688e2001fb5493ff33a029124b3fee24e2cc09758829d7217820cb629af08e79046357ed0aa893bbb61beda25cca03cb2f3b0 SHA512 9aeb144460c2b25b496ffe6f92807be6063b8c8dd60d4f7d27487abd356f9ea2e1469e38690ef760486db8082505ce3ae469ac2645a0a53c2bf6f02141426272
 EBUILD python-2.7.18_p9.ebuild 10279 BLAKE2B a9cd26c7882ee1be288b98c99cb11b6e34d742449bbefefa0e05f2a6b2d3dff8cf60130272373dccdf894734a77eafdb035c2bfe0cabfff7693d198741cd3967 SHA512 cc67da5aa6f73ff333b3ddd881295f984203eb28d100b1a0817cc2ba1e629983f5e7fd64aa200b34eafa23002e9716b96f4a5456f626add2b01de1db873139fa
 EBUILD python-3.10.0_beta1.ebuild 10045 BLAKE2B 085fb4c2d64576159313076da40f6c7096d6815151d2a3e082a5bae5164d40442996d579e887dc5a39fa52dfb1220b67fc26f840b2f0b1997346fccfdee56009 SHA512 e66d80207f5897b6bcd72f1506ee5418c13eb1cc51a1b3681e653d49d7473f5755edc8096c7d3becb613275f1e40a13b399b9c61dfc85da9b9e209791ea2d230
 EBUILD python-3.6.13_p3.ebuild 9827 BLAKE2B 1b4e38ac6584840625040b89cb888db177a46cd6faec6c236c32f56b890fc6487c826dd9820f05ba9493a792df8f2bab252c7e1c3c86a49fc0e3e1ae00828b43 SHA512 185ca27fa6ba4ed17b89d0e6f21efa5fd44aa40637f3844401e7d6140f82d6d2a815d61210aad50c322de029bae7a46654c90e4ec448bbee6caab25d3a82d711
+EBUILD python-3.6.13_p4.ebuild 9835 BLAKE2B fe07cb4e400f4c7b28c33684d2ccd241c083b9a0f9b1d064dbf78bafa9f08bd01e1c1126b0aa3b2c798e5663e74260ab27a167d4e7743b8d1f13f946094b2892 SHA512 817d0ae1677d08c2068debd873148992c652ff58a4718378c43a6ead9fc09964745de6daace955cec603cab46e9b9520bf92738794e581290306f03ab5344b26
 EBUILD python-3.7.10_p3.ebuild 9632 BLAKE2B 85597824af2426a591a909d7170410ae405bc06381c63ed1603571230efc9b0b2aa8d06443845efb38535d4844a632771ea483845d0034506b69f65ffb509531 SHA512 a0287b8ffc461e9556770cacdba761448a0f2ecbcac6a383c586fe0577bd3fc7603c06b23a186d2f3c15d156b9635a508660cef8812dd18b34834ca0fca9a8f8
+EBUILD python-3.7.10_p4.ebuild 9640 BLAKE2B a38f2c17009ceddd8d5e98da45edaafd8bdf82e1100fb4cff5a45c853f263b592b7e4f51f0b22f62be49b74a1ad4bef001af3a4225a7f39753eeaf1dfca1b6b2 SHA512 077bfe00609cef8943d76306842c2474e12b3dd45c088c67d2ea734cf6bb83e334777a372383c51d5afe9f7ff36f606abba1a9c3eb30e5063891671d67b7d218
 EBUILD python-3.8.10.ebuild 9794 BLAKE2B adea166e768e09b86cfe01fb8629822750261871c1b300e94815967c201ac5b406f1419401e6d0e7872bb7a34e5ca8cfbd0b4dc4ab66855693e74ec540728e4f SHA512 8b2190820a441b4f24ad44cf43c96dc3ac92abc6f02d6bc77dd914d06a95e6ca65c189af73965f9ad9a17c2d37c700fb0cc88b2cc23d6b86806a8661f669406a
+EBUILD python-3.8.10_p1.ebuild 9794 BLAKE2B adea166e768e09b86cfe01fb8629822750261871c1b300e94815967c201ac5b406f1419401e6d0e7872bb7a34e5ca8cfbd0b4dc4ab66855693e74ec540728e4f SHA512 8b2190820a441b4f24ad44cf43c96dc3ac92abc6f02d6bc77dd914d06a95e6ca65c189af73965f9ad9a17c2d37c700fb0cc88b2cc23d6b86806a8661f669406a
 EBUILD python-3.8.9_p2.ebuild 9786 BLAKE2B cdb4cc561d0dceced2e987bd268b4aba5491cbdd2b4a232f59822ff6c913acdc688930c24b25dc771ed0cb63c104ca744dd6c0c3c79ddac175206fbe3dcb9493 SHA512 72757c70b3d179fdc91be409fe8eba79e9868f7672ed8686074027c9a76edbdd0ff9ae54b10ae2b51e116904d36d69a4e9a107f2613bfeecedba32da3c8261d7
 EBUILD python-3.9.4_p1.ebuild 9925 BLAKE2B 8dfccf4bbb7fe7ee7f81cb7902c3f5db8add7694af475f4d9f80b9e4c87d2032bba1758cf62ccdb62eb56c79fa9bc238f850205d5dc159a172f9f4f4757bd351 SHA512 0402ea45911ba01183a65213b0050c9f976c218f1e938f716ac66178e122379c24714758463d1010fbd78828eb36123f16b4540aec0f75216706bc7dfc3e7014
 EBUILD python-3.9.5.ebuild 9933 BLAKE2B 1d492eae570d852efde804615a52f80b650aefa2fe12b64d7cccfe5d950085629d5d8a5251a2452f477233a84b8a9ae0bd5640d59978ee36c1a47048ca6c1b4b SHA512 84c0965e128bc9337373fdf280faf0824b2be0874e2ae1ac75986c0a2eb24bad57c15779487b951708cd56fe0467eec90cda787a3ef788592565fdd1d664f6d8
+EBUILD python-3.9.5_p1.ebuild 9933 BLAKE2B 1d492eae570d852efde804615a52f80b650aefa2fe12b64d7cccfe5d950085629d5d8a5251a2452f477233a84b8a9ae0bd5640d59978ee36c1a47048ca6c1b4b SHA512 84c0965e128bc9337373fdf280faf0824b2be0874e2ae1ac75986c0a2eb24bad57c15779487b951708cd56fe0467eec90cda787a3ef788592565fdd1d664f6d8
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18_p10.ebuild b/dev-lang/python/python-2.7.18_p10.ebuild
new file mode 100644
index 000000000000..01e2a9bfd33c
--- /dev/null
+++ b/dev-lang/python/python-2.7.18_p10.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+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
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# 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:=
+	dev-libs/libffi:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:5.1
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+		sys-libs/db:4.6
+		sys-libs/db:4.5
+		sys-libs/db:4.4
+		sys-libs/db:4.3
+		sys-libs/db:4.2
+	) )
+	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? ( dev-libs/openssl:= )
+	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 )"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+PDEPEND="app-eselect/eselect-python"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+	!<=dev-lang/python-exec-2.4.6-r1"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+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" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	# dbm module can be linked against berkdb or gdbm.
+	# Defaults to gdbm when both are enabled, #204343.
+	local disable
+	use berkdb    || use gdbm || disable+=" dbm"
+	use berkdb    || disable+=" _bsddb"
+	# 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
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	local myeconfargs=(
+		# The check is broken on clang, and gives false positive:
+		# https://bugs.gentoo.org/596798
+		# (upstream dropped this flag in 3.2a4 anyway)
+		ac_cv_opt_olimit_ok=no
+		# 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
+
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2")
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--with-system-expat
+		--with-system-ffi
+		--without-ensurepip
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	emake
+
+	# 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="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	# Daylight saving time problem
+	# https://bugs.python.org/issue22067
+	# https://bugs.gentoo.org/610628
+	local -x TZ=UTC
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /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/$(get_libdir)/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/$(get_libdir)/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
+	mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
+	mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
+	rm "${ED}/usr/bin/smtpd.py" || die
+
+	use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
+	use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		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 scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python
+	ln -s "../../../bin/python${PYVER}" \
+		"${scriptdir}/python" || die
+	# python-config
+	ln -s "../../../bin/python${PYVER}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	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
+
+	# python2* is no longer wrapped, so just symlink it
+	local pymajor=${PYVER%.*}
+	dosym "python${PYVER}" "/usr/bin/python${pymajor}"
+	dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
+}
diff --git a/dev-lang/python/python-3.6.13_p4.ebuild b/dev-lang/python/python-3.6.13_p4.ebuild
new file mode 100644
index 000000000000..bbce0c2bb3a4
--- /dev/null
+++ b/dev-lang/python/python-3.6.13_p4.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2021 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 verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+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
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads 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-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? ( dev-libs/openssl:= )
+	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(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+PDEPEND="app-eselect/eselect-python"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+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" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		configure.ac \
+		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 "/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
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	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
+
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--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[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+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 faulthandler"
+
+	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/$(get_libdir)/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/$(get_libdir)/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 threads || rm -r "${libdir}/multiprocessing" || 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, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${scriptdir}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.7.10_p4.ebuild b/dev-lang/python/python-3.7.10_p4.ebuild
new file mode 100644
index 000000000000..1cfc503ae0f0
--- /dev/null
+++ b/dev-lang/python/python-3.7.10_p4.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2021 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 verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+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
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +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? ( dev-libs/openssl:= )
+	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(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+PDEPEND="app-eselect/eselect-python"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+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 "/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
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# 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[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+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, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${scriptdir}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.10_p1.ebuild b/dev-lang/python/python-3.8.10_p1.ebuild
new file mode 100644
index 000000000000..0a87aec91800
--- /dev/null
+++ b/dev-lang/python/python-3.8.10_p1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 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 verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+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
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+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 +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? ( dev-libs/openssl:= )
+	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(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+PDEPEND="app-eselect/eselect-python"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+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
+
+	# 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[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+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
+}
diff --git a/dev-lang/python/python-3.9.5_p1.ebuild b/dev-lang/python/python-3.9.5_p1.ebuild
new file mode 100644
index 000000000000..444f9d6d14b5
--- /dev/null
+++ b/dev-lang/python/python-3.9.5_p1.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2021 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 verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+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
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+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 +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? ( dev-libs/openssl:= )
+	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(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+# 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_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+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
+
+	# 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[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+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/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index ed81a88d9d2a..203ff48e8dd8 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,4 +1,5 @@
+AUX qu-prolog-10.x-compiler-flags.patch 762 BLAKE2B 1b96597015aeae67aa92caf5913e81f2bf11e86c73ce6acaaeee1f2663871471fd595eaccfb00cdd10cedf9677c03095bc37ddc2a8d4a370d38439896f16e72b SHA512 c09286d76692a125d98b6bf3684df0d6dd57cd5ef70387fdbd5184493d978c8d5b9c1ce63c4305986df28382e0201abb53af3a6451f802d677dbc22b1741237e
 AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
 DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
-EBUILD qu-prolog-10.6.ebuild 1987 BLAKE2B 3fbfb15e9e8b1ac7c2593cee7e0931f6b1a414495a38d71177fa933a6d517c6611ad12e37a15ea359365838d8dbe457efc0c55832db1b0329fde9e9eaed8be3c SHA512 4279baad07b02ac982a7ad4446d2ed4c5445a1054d51240d8fb39d5f7c359c09db2774cbee8eeb990ef8895e612ab5a21ece8843ef3cc5bb0575e0856aea3ccc
+EBUILD qu-prolog-10.6.ebuild 2057 BLAKE2B 98f02cf71778297e0740bb4391daee090aa0210aa21880b86cc01c19483d380a24ce3b20ff7b02abfadec920cd61254d1b8e958e156b46a192bd846ea82116d3 SHA512 5a44eda52749d9ae7fbbf51f0770c9f913a60fbcd15f3ea92715c6b3c6b0e66d63c8cb54b14aa107dda6a6fdca80533560ad996efe13e390b93f1880caf9b191
 MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
new file mode 100644
index 000000000000..3d07947a4977
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
@@ -0,0 +1,18 @@
+--- qp10.6.orig/configure.in	2020-06-24 23:37:02.000000000 -0000
++++ qp10.6/configure.in	2021-05-15 16:36:32.504585122 -0000
+@@ -228,9 +228,12 @@
+ #-----------------------------------------------------------------------------
+ dnl Check for -fno-strict-aliasing
+ AC_MSG_CHECKING([for -fno-strict-aliasing])
+-echo "int i;" > aliasing_test.cc
+-qp_alias=[`gcc -fno-strict-aliasing -c aliasing_test.cc`]
+-rm aliasing_test.*
++ac_saved_cflags=$[]_AC_LANG_PREFIX[]FLAGS
++_AC_LANG_PREFIX[]FLAGS="-Werror -fno-strict-aliasing"
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
++    [qp_alias=""],
++    [qp_alias="not-found"])
++_AC_LANG_PREFIX[]FLAGS="$ac_saved_cflags"
+ if test -n "$qp_alias"; then
+     AC_MSG_RESULT(not found)
+     GCC_ALIAS_FLAG=
diff --git a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
index 85d6eac48632..2cbbe5135522 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
@@ -28,12 +28,14 @@ RDEPEND="
 	pedro? ( net-misc/pedro )
 	readline? ( app-misc/rlwrap )"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl"
 
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
 	eapply_user
 
 	eautoconf
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 4d862f59ac2e..e1a65374facc 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -6,4 +6,4 @@ EBUILD rakudo-2020.11.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c9
 EBUILD rakudo-2020.12.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c981c289c30cef897294cce48022fee2aa7d7f51161bbda52850d6e9878c423877f47fcdd8aeda5bdbbfc2533f7e SHA512 781d36e3c0aee054795c8f9a4ebf40b28fdac7fb83eaefa1ce65d9b9cad3d224bd8a6a241820d2e779f1d397f8e2a677dcbbcb5b52acf389369e05b2747ac558
 EBUILD rakudo-2021.02.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c981c289c30cef897294cce48022fee2aa7d7f51161bbda52850d6e9878c423877f47fcdd8aeda5bdbbfc2533f7e SHA512 781d36e3c0aee054795c8f9a4ebf40b28fdac7fb83eaefa1ce65d9b9cad3d224bd8a6a241820d2e779f1d397f8e2a677dcbbcb5b52acf389369e05b2747ac558
 EBUILD rakudo-9999.ebuild 1733 BLAKE2B cb26f65cf3e9ecb239df9a29037d20c2225581214f3b8b9622822c1785384e3a174857dbcafb0b309d5d2261bf78853842051299b47ad29f37602189d318a54c SHA512 c7a2c8febbaeff8f0b8b0cc9909062392c988bad08749c870ccc3cb3e239a8a105e0ee42f1efa5e10485cc86155b206b8ef12db43b95de58f9e192df7542ad05
-MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a
+MISC metadata.xml 395 BLAKE2B b9b773f93823cac435589cc51630593affbcbf083f13f87576a56cd1fbc7493cf7513b709d7cfe12d5d323ec205cb10f72eb3ba42685c76631a2773774aeadf3 SHA512 91dc0ea511efb537b854bfccd3df153ec29cb83c6fb6b7cdf186e09193239a7b5aa3fabfb2c4225d991207f33feb0b10a6d29200b3790a4c662a36f47cff9766
diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml
index 4223f6b2087b..d7f99ab9df68 100644
--- a/dev-lang/rakudo/metadata.xml
+++ b/dev-lang/rakudo/metadata.xml
@@ -5,10 +5,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
   <use>
     <flag name="clang">Use Clang to compile the MoarVM backend</flag>
     <flag name="moar">Use the MoarVM as backend</flag>
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 70de016fc2fe..a178cef4a488 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -22,6 +22,8 @@ DIST rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz 182726600 BLAKE2B d9051eea2d
 DIST rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1fe8c5764cb11f722893c7efcfb76d5f17ee80a104ede360fedbc8cd1e2996246e0a770959398a524ae55bdfb075dedb2c2583816bd3de28034dddbf248a54c SHA512 3b7e3f15f5a2a4876175a26d7b4332d4a6847a565d5de4c2cb67c52cf26308215286777ea9d89366543ddd1ce353d6a920153549b6641ffeae8e9954470aecfc
 DIST rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz 192084372 BLAKE2B d127c1827956c7594da5b69346168504b22726e176f03172b599e0a0fae2400e273684090f1d0fd05c33f193b3918c98ccd64c3647b0577b51431c3409083b2f SHA512 b53a741d1d75637fb31ddb0364e1f91427c3818ca145f819b906d13c32c638ae77fbaa567a6220b6bf69f38cc00d2b95615778a86f4acadd63efe2e62b1b01ef
 DIST rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f79f8e1ad8cb0dbc6e1cb45fab2bd19a03d1939518529841155e7a00d9a42e3eb2539ae424c68af7140399a2b37c6ff5a00c55f0467ce4acf6fd7b1ddf525a63 SHA512 785ab118197d53b5f4512cdb07e6277c9ff58b9e53610dcce1c9f928cac8a20b1fbaaa7acad8cbe4370a3fe6dda5f726e8021e8987688a9ec242f73ed8d12adb
+DIST rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz 179131092 BLAKE2B 1d8cc335cfc434871e1916793974eabd14fa96f49ee9b0f9ae004326c405dbadccd0249ff28dddfecb9921cae4e886f4114a8221e09fd7944f2d2e96bdb12bd2 SHA512 7fb76c3ddc952b43320bf3497d890ff79aa5634df22f38958835cd1d4044bef44257af22d7473675afb42a7c2fc9ac713f210d6bfe1e61ed56d5265f58add540
+DIST rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b0cbee67d6bc37ccdcdf2c563667f3b3e4ec7377e5c86b627cfbbd7385425508778bd67887f46067476ffbf3b5f2719d6b5490d2fe5261db5e7f4da4bbc94be1 SHA512 fdf1ed20eec719435a557be8e6bf6766b0b56e27fa49c65b2c412875a1c76919ff6d6a4d8d14bafa8aa96eb42deca65869db6ca5d2b61a84a0af07dbeb1e9ae9
 DIST rust-1.51.0-s390x-unknown-linux-gnu.tar.xz 191632144 BLAKE2B d1690825f59e8ed1ed4855556ff36c05efbc941097744e31fd9207309087d53880d418f737aa0cb9371b973c9c3d56f05ed03533df04402242194ef13b8d608d SHA512 a72ad31c6306f939c4f963133ddc0b3fabc9e506bdff5e318f5275658b7271a675a51d208d306d94fb01739cbcf0f62f018fc7490ca6db54b301852202749d16
 DIST rust-1.51.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 355e753ddca453ca36a8c1e4f361e9655bdb54f856a642be3d4024772266ed1771a2673ab1026c64bbf7ac8d1fc30fb1924a939cc3ea290e98b137edb48bbf6a SHA512 89bf145b8e620eac99b0fe4a79ee205a04550c664bba1e22a7611ef37736cca3cb911ac89659126e0c6fa60e4dbfdf0dd54a8693e496d4c37e4f7d3f518e2740
 DIST rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz 147543532 BLAKE2B 44ac97f6b650e65de257b362121091176e02fac60aa534ec83ddbc4e16eb32f7a4a7999cc28eac446f5790572552fee5c2589350cb6d159a946d90007d85c7db SHA512 9f95045119bcd5ef7be54f5b5bdc9ebc6bd6c48437d90762a1cfbc03281882f81087e1877eecae9573ba5e7cd7c11ef5fed979034c57f45b6547cbfeb11eef6d
@@ -52,12 +54,14 @@ DIST rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz 185066924 BLAKE2B 990b9fb32b
 DIST rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b9a051228baaaef85826d958944e597a9dd5750b4d418bbcedf86b4617036c2d90c27bb67e95cb388b8b80e2e74baf9c1fa98fee88fdc8a3b63810d556bb23b0 SHA512 9b9a1161a9c88d9b3c9035906f4be66a2fe6b2fa51f89cb740bcfca14e1956ce218435b9b99caa6cd65407db5cdb8eb9427ce1dcb485e6164c85d41fb1429b40
 DIST rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz 194463736 BLAKE2B 509179480571e918c08048b5d54120f090458f4f5ef8e376589943c7c13f23b054381f2b85fc75dc8c068ead73b1d38aba14b5125156ea92d2c5cbec4a8a849d SHA512 04bb5310fd78bd1cdd40e778d5a590111f405d6508c41fbf7ebd23549b90eef69b52fb07d204879747f10c2a7a5a55b4bd8cf48bb82ef3624c5b880fd2b923eb
 DIST rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 130f0731128afba6c0ac5b98251bc7d1f7378b667031d6cf8c2c92e48ff120f1f2a1d621bbe558adf65ec921c2309c4eb12b0fe239b3098005ca5f186606564c SHA512 a86c119e384a23d7319182c752cc85811dd12d292310a1d76e5d2e053293fa09d05810314f401113578d26ec8f4149ca3cdb1690cc72981892de6aafee99a3a6
+DIST rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz 180847392 BLAKE2B 06fb6eabeefe2d58c641a81d0a8ded26bd684141210fae312f23d38dc93a03746416b7014356643d77c69b3b323246b75614e79f5abec94e377eaaa0710e4ebd SHA512 71c3ac3a1cb5d60754fbd528bfd3fcf422cdf654bafcb2b3db73b3a01114f711a3d0f6a0547f170ea72c209477235a4ab1d45010fe018c64ac95b7e7726496f2
+DIST rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ab20f91222fead475ad0e0b12801cb39da8bcf5a3a39a5ff6ccf9b282676e989a10dfa845be02aec4d7b9f924c60bbf67f37e83ae4485278f5851feadc5dcc2c SHA512 f251408c3bcff12615f2fd33f61c291745ddb1d3aab80c46e17592db02bfac52a9baa880c7e59b9716f69eeadb445f0592bc2bf3fa236ba7659b35dbd4db9b4e
 DIST rust-1.52.1-s390x-unknown-linux-gnu.tar.xz 194805300 BLAKE2B 64305850ed1f362ac8d80ff3bd1f084ac84f2b8788f89c0fb67ff5c4835ba630e6f760608b4867d501eb8fa1de8f11da3fc5b44dd17e80da755990dc53e074bc SHA512 13405aaf093f6b09cb964d8af241095f252323cb6fe9479243e75945483daac5e7a853c815fa6f4e2bd8f8819ee2a9eb8ba6f5245ada0515d3107d5a441c67fe
 DIST rust-1.52.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e27a24d02d2d42d394a29177a99f8149d45075a537eeb3551fdcb811086ba97c0ec64e776549b0310587357be2e420715988261ae686832630f0496b224721f0 SHA512 1f31c0e0c74ff4010c529775f1c527b5ef14a4676eb67930939dc199e6d029d235af8931a06cdadd5a3fd266c302eb7645002d85cf634f76e439d8de66d746c6
 DIST rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz 142761092 BLAKE2B 1edd915373f09d32cf32311650636c73e934257aeeaea806fe9a9084f4d954989db909ca2a85c4c19209b8667fb16681c476b53e45564ca3b6d5ac378d772e6f SHA512 9ba98a509bf8820f0900d31821ddab02f85eb1df927c171258b39140e846c195b4b23ac733f0a9738ef068d0c1c5832efa0f8915c9fae57a561711c0878aea0f
 DIST rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e013c0fdfb4f9d90997763e9842dddfa4d707818a2a606893be9bcb199c54aba191e34a37decb7d15edaa1bfe14a228eb9ce8acc27f3d1f701676ec97a65ee33 SHA512 cc7956699f102de534ea69b3a620f2d937f1824424742722d5fad0e7f3009626edb95ed4036a8de44e41b429d584bed0f57baebde72970bd42e45e865194507a
 DIST rust-1.52.1-x86_64-unknown-linux-musl.tar.xz 239386548 BLAKE2B 404e8afe160b8d3e03ab31d04439f1b19a106864882398d2a2fbe31287db7ef60869e5d91d80591e7eeaced24a5d04b552e0fee1ddce37c09fe8679945d83dfd SHA512 3bf62ff12da190b0025c4ddc906d1212bf82db6936d724f81d3f289b005126c83c365226a94928db2bc8e878e974b4ecdd0f173b1873f4a55ac4d5087407b141
 DIST rust-1.52.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B a9c7e7ae792f05a4078d97bb165d6a2a12c39386ac5ee5cbdd005eae8f6b7d9e7da3dd13d495f5370d86cfa917f090c7d426c7ac3ca479750665bf4f89322e04 SHA512 343727431af8ad88e961997bf15b31eac65b8235befdd0f841a1ce98b8dc89a70d517f4ef499a7b366630ea2374810635334694b51ca05da370456875d718191
-EBUILD rust-bin-1.51.0.ebuild 5365 BLAKE2B 4e018f9852a488e19a59f76736705c7ee844781ea03d7da58059ba6a1bbd577d9c66457f14912714c249b24e0793fd54385d0cbca745ab952deed70de4502e8d SHA512 199ef496c4b3bd512bf445bd970c1532784420bf0daa3b7a75965d1897f0d0fe334959dc01aa1dc0c1996641aef49637522c0a245c37b3ada1350afeb9c5ae1a
-EBUILD rust-bin-1.52.1.ebuild 5370 BLAKE2B 15d77e856344801f7ee2b24d2d22191c28f801d25011caecd740a45531f792d29a123f194a9a000caf81934b7fb8bb723f3324602bcb34ff6d0774b36f181304 SHA512 8c0d0326c76d78fe6cf2f28d08624d851233a01c1f45e608d78a76d23959e4a843243be4136576f4d048c68b0b0e520cf01465c4999c1cb49637272034c7a1a8
+EBUILD rust-bin-1.51.0.ebuild 5372 BLAKE2B 9d0e86e08e792834811ef3336ca87eceec3da99853def2ae4143b5122a32d5a9f87cd269a661b4a7da3b1b5df7db2a2e392aeb95e62e84606f138ba319d7a417 SHA512 62f9643eb407f53c015e0abc0f1b2ca5eae8e53541ccc2c03501cd76f1418ea4766778ccd1c2c2527e51ca6403e5a5ee76ac5caa8141e5a945c8df295f4086b0
+EBUILD rust-bin-1.52.1.ebuild 5377 BLAKE2B a0de2e2698c8af317c93497f8445f1b74db113255b4afae90567cc238191c079b8b7aaf59288af6ed999b01754ec953084c651f6785e71456fa0c82c1ea49c9d SHA512 0656930eaff0acd31c1065c0c9b407404587c59bf76f0e79ee4ea1c9460fd10d8dee783ed886dd1e9551b8fb1742ccc74c69433b1d64a27777541e77c88cb59e
 MISC metadata.xml 489 BLAKE2B b9c157f91a878ec1196183173bb339e9beb832e9b002cd72ac5b0fc8a64e7d7b27d165f79bf34eb1debfa69c2381b5b9a74a9b52cefc9efdfe41c93ed72ecd9a SHA512 814c53f00547b8a2b12cab136c95222480ab34b1cec307029e66c7d712e1e00eb2a725ccdfe73d7f1b154b362867c7150caef3609daba20f8d4c2496c47f6b09
diff --git a/dev-lang/rust-bin/rust-bin-1.51.0.ebuild b/dev-lang/rust-bin/rust-bin-1.51.0.ebuild
index 842dfa4c29df..e15339466bd8 100644
--- a/dev-lang/rust-bin/rust-bin-1.51.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.51.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.52.1.ebuild b/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
index 2b18190563ae..d51744bf0b3b 100644
--- a/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index e366e8e94dea..fc8fa53f0c2a 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -31,6 +31,8 @@ DIST rust-1.50.0-powerpc64-unknown-linux-gnu.tar.xz 180157804 BLAKE2B 8d3c38cdea
 DIST rust-1.50.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 74a45316f3ad5924db4f9c714d25e0f4ce3e94bc022544f238a32417f3d4f43327402d404bd96675d60779c12968a6cfc3b837804772de000048a808b82ff676 SHA512 74e9663e347376819318aa2faf53e20d85aa2879ff88d94f64f8d01a278c2d7f051e1a31300142c02a049f4f0ad4cff2f2dc944a3ed3436283cfd00b5238ead2
 DIST rust-1.50.0-powerpc64le-unknown-linux-gnu.tar.xz 189754060 BLAKE2B 8579349a7d916ee701f29bd66d08a76d8433ad86020571e5484edbc8d9a984088e6942e31b18179698a199ade2fcee3b1b9aed1cc0d5a3b996e763ef2b8e0b33 SHA512 e3dc75ba7dff3a358042542afa398ec8771a23f5f699454a876ddc1f3583d399fe5350696a5da62d71ca97ea882c9ae1fcb60dc2e9fdf76bc7a9af892096371e
 DIST rust-1.50.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ed68b9dd309bcc4d575374a3eab6e96f5625dd84fee58abc6fffa4aa37b2b51010cf8c9d638d2b16b92ba7d4c80e238c4a788a800adef5da90a9ed337ed6898d SHA512 e6569a50256f30a1f91233fc855f8b8d03a8a1f75f583a4260a8f18acff7e2ef8c355775525aeeaf28ba33684a9636926ce0d6f4e542933ba0ddafb1e839654f
+DIST rust-1.50.0-riscv64gc-unknown-linux-gnu.tar.xz 177780892 BLAKE2B 1c52d993383a1de7a4635c573e11ecb04db4f926435d3aa912f8d9c2169778fed43580567cc143406e8937a117591c9ce2ad38f8a54829684d61a04af274c5c9 SHA512 437d0d35c1a64e1be336e258546511a3af4d809411eea507950768878bb66053412b4297c4101e166edf42baf722885458784e2ac87ce2fc618bd981448785ff
+DIST rust-1.50.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d0e8567ebacf42fccd11a210b56fbf82a7e31ff568db2fe2427e8c57b4a9e3a8de0b568479020881f1c8343a135d202731920190075dd1d523aaac1861d4e806 SHA512 1dc1d7f431727bcae85e453b907a8bc93221dae09823fae5f4b89c7a78dd1b239e41c264f62fcbd1dbf42e3eab17304be312dda36bd3844baed08611e443cf76
 DIST rust-1.50.0-s390x-unknown-linux-gnu.tar.xz 190157972 BLAKE2B 4fe8ec73293815ade006e2c383d1a6d541d87d4ebba76b3ace65793f7debfd54d3dc07cac89c43e41947f8d0b69bd0f213dbdca8173f610ca2da03bccdd55ddd SHA512 733513af2a7ef7a782a5ebfbd080071194ac47084022b54b4830de84facef9986d65525f8666a4c226e9878e43b00ebced26d6077e5fb1b7f775ac8f290fba97
 DIST rust-1.50.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 034daffe5d8df69e5cff8d4ba58e8c8d1540ff3bda07c816871e272a3bd6764ba4b8300cca96cdec3bf1b2994cb9111f4d79682561c6f9de1293f58e1e59449c SHA512 3c4f2aeb8533616148e11c7250396cd2c113b0a0725889b9bc8e9a5d4d1069c26852e4aa0b69887bbc2b42c2145a3faf8047bc7b1e24ceb76c88b7c288529dc3
 DIST rust-1.50.0-x86_64-unknown-linux-gnu.tar.xz 152873328 BLAKE2B b0bb91487186f13a7a1a49edeac28bc347c300911f574aba0e70c37e05b688176f5941c97cc4ad0ceddf32f2fbc0bdda6f8a1fdfa482aeb9682ea1fade28206e SHA512 ab49e3ecb14e4af8e48548845184e9ab3d564ab2341c1e5462b7847347c79d13324211b860988d219ccb646143bf142fb14c3ab03663b06cfe9ca275128d9fa0
@@ -61,6 +63,8 @@ DIST rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz 182726600 BLAKE2B d9051eea2d
 DIST rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1fe8c5764cb11f722893c7efcfb76d5f17ee80a104ede360fedbc8cd1e2996246e0a770959398a524ae55bdfb075dedb2c2583816bd3de28034dddbf248a54c SHA512 3b7e3f15f5a2a4876175a26d7b4332d4a6847a565d5de4c2cb67c52cf26308215286777ea9d89366543ddd1ce353d6a920153549b6641ffeae8e9954470aecfc
 DIST rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz 192084372 BLAKE2B d127c1827956c7594da5b69346168504b22726e176f03172b599e0a0fae2400e273684090f1d0fd05c33f193b3918c98ccd64c3647b0577b51431c3409083b2f SHA512 b53a741d1d75637fb31ddb0364e1f91427c3818ca145f819b906d13c32c638ae77fbaa567a6220b6bf69f38cc00d2b95615778a86f4acadd63efe2e62b1b01ef
 DIST rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f79f8e1ad8cb0dbc6e1cb45fab2bd19a03d1939518529841155e7a00d9a42e3eb2539ae424c68af7140399a2b37c6ff5a00c55f0467ce4acf6fd7b1ddf525a63 SHA512 785ab118197d53b5f4512cdb07e6277c9ff58b9e53610dcce1c9f928cac8a20b1fbaaa7acad8cbe4370a3fe6dda5f726e8021e8987688a9ec242f73ed8d12adb
+DIST rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz 179131092 BLAKE2B 1d8cc335cfc434871e1916793974eabd14fa96f49ee9b0f9ae004326c405dbadccd0249ff28dddfecb9921cae4e886f4114a8221e09fd7944f2d2e96bdb12bd2 SHA512 7fb76c3ddc952b43320bf3497d890ff79aa5634df22f38958835cd1d4044bef44257af22d7473675afb42a7c2fc9ac713f210d6bfe1e61ed56d5265f58add540
+DIST rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b0cbee67d6bc37ccdcdf2c563667f3b3e4ec7377e5c86b627cfbbd7385425508778bd67887f46067476ffbf3b5f2719d6b5490d2fe5261db5e7f4da4bbc94be1 SHA512 fdf1ed20eec719435a557be8e6bf6766b0b56e27fa49c65b2c412875a1c76919ff6d6a4d8d14bafa8aa96eb42deca65869db6ca5d2b61a84a0af07dbeb1e9ae9
 DIST rust-1.51.0-s390x-unknown-linux-gnu.tar.xz 191632144 BLAKE2B d1690825f59e8ed1ed4855556ff36c05efbc941097744e31fd9207309087d53880d418f737aa0cb9371b973c9c3d56f05ed03533df04402242194ef13b8d608d SHA512 a72ad31c6306f939c4f963133ddc0b3fabc9e506bdff5e318f5275658b7271a675a51d208d306d94fb01739cbcf0f62f018fc7490ca6db54b301852202749d16
 DIST rust-1.51.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 355e753ddca453ca36a8c1e4f361e9655bdb54f856a642be3d4024772266ed1771a2673ab1026c64bbf7ac8d1fc30fb1924a939cc3ea290e98b137edb48bbf6a SHA512 89bf145b8e620eac99b0fe4a79ee205a04550c664bba1e22a7611ef37736cca3cb911ac89659126e0c6fa60e4dbfdf0dd54a8693e496d4c37e4f7d3f518e2740
 DIST rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz 147543532 BLAKE2B 44ac97f6b650e65de257b362121091176e02fac60aa534ec83ddbc4e16eb32f7a4a7999cc28eac446f5790572552fee5c2589350cb6d159a946d90007d85c7db SHA512 9f95045119bcd5ef7be54f5b5bdc9ebc6bd6c48437d90762a1cfbc03281882f81087e1877eecae9573ba5e7cd7c11ef5fed979034c57f45b6547cbfeb11eef6d
@@ -71,6 +75,6 @@ DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1
 DIST rustc-1.51.0-src.tar.xz.asc 801 BLAKE2B dc06d0bc40bcc5ec5ae247495b6975584a80a35480d36d45db4db57872432cc9c3d38238bf68a56386bffc6987f5c491cc75ef21cc7ba9260073c199d7e1791a SHA512 f00d69117e9f38a179219f976230582fc51b494a71519fd3c032a8abdf8d554d659122f671881783f2a49517b79cc4617986447d5972f7ff2467d56fce312c4c
 DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
 DIST rustc-1.52.1-src.tar.xz.asc 801 BLAKE2B ea2f89289b4d9cf90a0d10148bf3494805c00e7822cc98addf0b602c35e4635bb1963d79168b395a5f7c7bd024070284fccd19757982daa0d554dcac166fd4d7 SHA512 0d692a085c017b03b8a135a28f7e6f1d7e05642d2e99f0f1fbc397e766bb8fed4b4c6b4c9157b79d9bb0c4229607dbc35711cd463c62a9966a4efb6f197de7d3
-EBUILD rust-1.51.0-r2.ebuild 19778 BLAKE2B 18c54ae6fb290f4774edab91fd279746ad7f3c5a6928d9cc8924cf6f8f15c1b9e369659401610a29b48bc0a689303282ffc649c0c4490a892f7720743c85243c SHA512 6bc80c4a17ced13cdd6c541898951767fad2e1fb8ee5ae2b91f68fbb1bd8afbcfaba8b319c96bbce75a9c4918c22ef9361c6e6bc5da8e3e04d19ebcdecfbc17c
-EBUILD rust-1.52.1.ebuild 19757 BLAKE2B 7276b331088e5b58d3001b000fd6a69b11d11f93876707ba9e8aa54ef2c6c605139f22851fc3f2191651b27146dbcfb2a3763acce7d688e0c555306ee04119bf SHA512 93bdff9f60abda1223e916c35f9797009c94c49b8c396f2908829f4e832139e7c5fbc7f84f07409bc9643f08048e27cdbdae4e067c0712a507ecf5555106ac95
+EBUILD rust-1.51.0-r2.ebuild 19785 BLAKE2B a3c6b6c6e88231ba86f6c2f575b71eccfce863945ede0daa1e6842f7ed2dbbd13893ba5605ae6a48f9d3e9e62ae1c0a50c44228cd96bd39a5daace2355d9d6e8 SHA512 4aaba4e925b6e003b4a5fcd76b82379542e1574e22d59443e089868ed26b7e3cb14aaac8d1ca358c99ada4acee871382046ef4922f2acc3a0d231765dea024c9
+EBUILD rust-1.52.1.ebuild 19764 BLAKE2B 828b81ef74c55f6c23598b6b517095c0e24219f83ee7ed2eb7e382735878097b6ba8ab98258a677eaebfc38fdbb112d6d194914f3527fbeb5c59b3040ad1c2b9 SHA512 b43d57632dd1cd1611fe8006b4e414fafbf3e3d87f323abebb8005fb24ddc6f6e80be0599d4942dde583c85e417ac74822d63248d27dd66e5da96f125fa3a332
 MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/rust-1.51.0-r2.ebuild b/dev-lang/rust/rust-1.51.0-r2.ebuild
index 926ebd4628c4..d672d89ea660 100644
--- a/dev-lang/rust/rust-1.51.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.51.0-r2.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild
index 639898a28bf5..625bf6563a25 100644
--- a/dev-lang/rust/rust-1.52.1.ebuild
+++ b/dev-lang/rust/rust-1.52.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index 57cadd83e6d2..f4c9a20598c8 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,3 +1,5 @@
 DIST sassc-3.6.1.tar.gz 26137 BLAKE2B 73aaabe4f4dab7efdaef591918da8a4bd79e98dff0105666548f00b09657f46d2e28523988d60eef7f4b1eedacbfe17638e96f5a9c98a5325ef9e56f681c0e28 SHA512 b6df8f481db0737ca08808c0849dcbd83e80799d883271d382607b7a74028153195f5f9c26768ffe1a9a92ee8c26be3c382ad7b3a5336eb6e4a0dad58132690e
+DIST sassc-3.6.2.tar.gz 26637 BLAKE2B 97699b1235dc955ef976c2ee87a42b5153effca4703c1003363bb192eaae5fd2519d7c8ae96bb94a53ea98de95a208b44f680dcedf8334b1d179a3484261319d SHA512 fff3995ce8608bdaed5f4f1352ae4f1f882de58663b932c598d6168df421e4dbf907ec0f8caebb1e56490a71ca11105726f291b475816dd53e705bc53121969f
 EBUILD sassc-3.6.1.ebuild 543 BLAKE2B c9f38480e2554b1116b98beb2e0a003177200c7e38482ea09a71213971a19057f00fbf07d152a3fc868ca9ac3ed853cdbc9108ec3c142a6faeb8f1cbe6b90bdc SHA512 ea199a2b858a3c701d8c88857b392928a8f0fe390279cf649b373d6cc59cc9fdc4c52e836ff546d707d20a03b605eaee3580ce51624e34317486c3703123fe93
-MISC metadata.xml 481 BLAKE2B 4f5d2e0062ba66e18b394807ae98e1ebe8925d0f094f969406f4d3c3cbed7fb001adfe41f1b61246df24f89e11b142d31027dfde07cfb919c60a2fece1ed20fe SHA512 2ba528dc5a56c29561f5b7644b5a428d99383965052233f4b5b03e0796a5e0bf1d7747548f9a7edde41471cacab1269d3c1cce089bba8ab33d903b4cd48585f7
+EBUILD sassc-3.6.2.ebuild 544 BLAKE2B 172055733eedae6bfc3bd65740c4beb2e691f32ab5a5a3ba15979866ff14ac3895b4f02bb6bd67e02203e514ddd43119f1b0c1b9252c3c7ca74ebfb435e5a538 SHA512 609a76c8cb7868ab87313d39d09dd4bb393e0ed496fce5621ba544ad3faf16e0995784dd1f710117b7d9ce7f902a67a2de06ce56c18686e40189d1ec6c036734
+MISC metadata.xml 572 BLAKE2B 706fbe91b8c10dfefc08c23797fe777577bf121e95f84f1c31ed41c956ac665af94f0f8e07457c4429354971a79866cd7ba7a76326cc2391c73b1f178166cccd SHA512 a7c798f0f7351bfd6c01d7f385af6c96a3f1a0e7570283cad837b718918307f0c05c663c82f1087aad2d9e8d60d22f2805bd6df7ac09b22d40c3f81660d720b0
diff --git a/dev-lang/sassc/metadata.xml b/dev-lang/sassc/metadata.xml
index 4451ee88e296..c66e2c90fe7f 100644
--- a/dev-lang/sassc/metadata.xml
+++ b/dev-lang/sassc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<longdescription lang="en">
 		SassC is a wrapper around libsass (http://github.com/sass/libsass)
 		used to generate a useful command-line application that can be
diff --git a/dev-lang/sassc/sassc-3.6.2.ebuild b/dev-lang/sassc/sassc-3.6.2.ebuild
new file mode 100644
index 000000000000..004b97134f49
--- /dev/null
+++ b/dev-lang/sassc/sassc-3.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A libsass command line driver"
+HOMEPAGE="https://github.com/sass/sassc"
+SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-libs/libsass-3.6.5:="
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md )
+
+src_prepare() {
+	default
+	[[ -f VERSION ]] || echo "${PV}" > VERSION
+	eautoreconf
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 13059a27bfa6..b021384edb00 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -8,18 +8,18 @@ AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.10.1esr.source.tar.xz 334444960 BLAKE2B 76f9bae7f9fddbf3ab14293d1ec9e51b173961d0d5e0e1ef98b65328294f520369b89fb300a91d9f502b93215a15c228925a469b7b14ec576c9a9be874a6561a SHA512 a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1
-DIST firefox-78esr-patches-12.tar.xz 67840 BLAKE2B d85abdbb54a252852badac50866cf5b5009c050ec4aa80ae2454eef2719e80f3442f5a74ec58d3c36531539042830427cd85507b708c1d5b36ea44dd0cef60b7 SHA512 4445c0880fc234c3838394483ce986e4e222260a99427069ba9c55b56fcd49a485ec916ee6aa2629f922390e92bfcd78028e30cc2e62fad9bc080ae45b26ba2e
+DIST firefox-78esr-patches-13.tar.xz 83664 BLAKE2B 92250d5bc3821ee1ff032236bd00e01a53e0af4f9e39696a634edb39f0a182bf5ff74b7fc0f107c9c53136c64485c398391e3a857c8b2b904115fd13d17e2a4f SHA512 96739811bea833a6a9cb09075dfe49c6fa7f613e8bd41e1d830d6ae6851ce8e2f5d27c87d0035b6f3a099340dfd7eebe6ecb930ff25079e76cea92a7610293ca
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
 DIST spidermonkey-52.0-patches-1.tar.xz 3112 BLAKE2B d8f4c44cb2ae290fa51efc4725a2c1b3cd85dd9f04f4ccfa5681ba6df5f37f5d8d4ad6859316a70d0f7647ac2cee014d126f88b7d4ca74a82796f35b141200ef SHA512 5328403e3b9ecd1c456037e7cca374c2453d9331752c48b9466e498e22fd8d4ca6e1804e51140ee0be027fcef7d0c3f26822b1f569305a3b2f03209b7fb15499
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
-DIST spidermonkey-78-patches-03.tar.xz 3732 BLAKE2B 5dc47527581c010994a102e6458119c762ec3836f57e403cbaac88c457f5f119bd75ae1a067307b20d229536f75db4b2b797408874d28156667ac63b61de8501 SHA512 f0921562dcd0ea519bf3f5ef2da43f87565e92493781d56e6e0b73d4124f41e7aadd34d8285bbb181f4286160dde0c9684920e98058f0683143a2687eb93cc1a
+DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
 EBUILD spidermonkey-1.8.5-r9.ebuild 3997 BLAKE2B ad8cafb47ac200f2e3bed78327d1c5371a40d17d64613016f7262e3f04bdc647e90d7fb233966c594fb3815dbc0a0112464131defc62ebf8defe9a44a3f400c4 SHA512 293c708081130cf9bf4d3ad7281a4f27e27845b5805f4e552efc6ee3a8cc4b86184591291049f521425e7d72d0999e55e91ed081a694d2ed2028d97d797a46a4
 EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4593 BLAKE2B 6244bf06572393bd4f821f36c0a6b7673d0b26d8d40ef84dc6eb189a8c67d8ebc86bcaf5ea1e45b5ccc5bb06db9308d72b6b6111aa8e863cbc74b6d812dc3372 SHA512 1da847fcf8fe282da2170f278f243bf8df6d890bf084abbc03a6a8cecc29d25ded3f98e23040f11daa5fee73e0906421c3af37f4e59b8ca324ea652646c15063
 EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4240 BLAKE2B fc4a9fe400c05aee5d7226d8fa17897dd4ee86b1fcbd1b8286620f626e7235c069e8c576faf9db00415e3beba7935e2fa4e0cde7e6f4a91eeaa6478f032e0709 SHA512 d4f2fdcc4f043f4cf966d7b396e6c4cd922e1b511f75aa3d22cb8cb235917ed66f22d25a82db61fdcc8de55d970c01945738cdef8af4413118c9f33133b1653b
 EBUILD spidermonkey-68.12.0.ebuild 7310 BLAKE2B 78473b652614a2cd4001c40ff981555358043d9cce58bedde8670e76b1c03d3aaa11da156fc17d20200a2e1e08075d88c6cfca57e5f41f5aed758e6d4a0199b1 SHA512 7a792dd7c6976a56f685eadfc4929ea26045ba4c464aac61b9dcb4e9545306e14e0a8abb3aecdea516611ab2bfbf9c7b0a0b273c89bf58b3d0a24f0ffcee43a6
-EBUILD spidermonkey-78.10.1.ebuild 12894 BLAKE2B e5042068fc3f4b37cdc151bab99f021a9b2c3f1a97c828cb43f8aaa7e03e8168eff96e029038e3c2b44c0103ba1629f4b9b052b6fe3e0af13f67e28140076865 SHA512 99ab76f29cda91f826a7084eeb8590184c9dea27784ef7b742d5735beecb67e59d34e17001f4e2712e93e1ddef4a4cc4a2fae046b7c6204216a7406e37fbdeb6
+EBUILD spidermonkey-78.10.1.ebuild 13013 BLAKE2B e297b060c95a3c27641a5628f00e4b30851c0674b89ab836633369a39fd8a9c89add36f28565394f07cbedf36b09a3c36077cf665ce58b7015515b66c680e235 SHA512 a030a03b4cc420f26ae6e3e4cce46f1831a9a282c182a369ec20a8e87baae4f8163ab050c5ad133e6b9b6b5f5733b2c8e07a42867dca17fe553c2ffb0181f5a1
 MISC metadata.xml 868 BLAKE2B ee529f60bc83af6c54188ab4db2a1e05cbc3fcebf7732580cb5e507afada8560cb8812d4f155ae94c2ec87724bdfafe7312de86b47a95f599655695836c9b806 SHA512 caf3c383cd8109391cbf81baf5e942630bfd84ca6bc2a78430e58e5b0a40428e08b8a3d7c9fadccebaf94fe1aa673df837246fc32d5932b7f60dd43431ee1575
diff --git a/dev-lang/spidermonkey/spidermonkey-78.10.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.10.1.ebuild
index b6cfe9ac6336..af3ff20519d1 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.10.1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.10.1.ebuild
@@ -4,8 +4,8 @@
 EAPI="7"
 
 # Patch version
-FIREFOX_PATCHSET="firefox-78esr-patches-12.tar.xz"
-SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-03.tar.xz"
+FIREFOX_PATCHSET="firefox-78esr-patches-13.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-04.tar.xz"
 
 LLVM_MAX_SLOT=12
 
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
@@ -230,6 +230,9 @@ src_prepare() {
 		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
 		|| die "sed failed to set toolchain prefix"
 
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
 	einfo "Removing pre-built binaries ..."
 	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 82aea96ad025..75579c5c0b55 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,12 +1,10 @@
 DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa88dd14284ea147ab5090695ff1c950365823451ac656403bee97c7dd4a039e2d58085456842f8bbc7caa26d18916c6f8718a204097c SHA512 c1f0dce1e336c79fe84a3f9d0fe5e873d33c00071f91cbb683a73fbceaba1c6ca8c2875b58045829eafcbee78a0e713009a07bd51a2c56bf146f14881899f934
 DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f
 DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327f9f995cd46657a71b6779d021eb4f5651b2be77883197c7c5ee31c23259f46ed559aeeb0bb53ad10aea0081ed SHA512 cdbd23d4a0e9699ecc32bdcad9979e4042fb0f24de84010f6f097bc7148af38150b0e61e393c057b0dbae932d0fc1c02a41808bcbafd2c23e24fd73070bed470
-DIST swipl-8.3.21.tar.gz 11143843 BLAKE2B 4e4a009e40609d17f33bd783c477295e20805d471ffdb8f6451b52a7c51a749c123e79d0e5087a473fe20c5a673648208540e7039403c35c7ffb044851f72f04 SHA512 fe8596a4d0ecc5d2d48e7532619bdf09364d1b52beffc4ea73cdd79d29dde9d68ddc1a66a4f2f579d7eee1a3e215e13e918ca59b26788957e5e2dd5af2905139
-DIST swipl-8.3.22.tar.gz 11153417 BLAKE2B a02638ca29d4a19978b10062ab7f8913480e397551cb88327dd020bb2ae40bf623911f673f88e41074f68c667e7075fa18fc7dcf7b3013e582cbc70d59a6a729 SHA512 6fdf0ce6743c042ef7af0195e8c92fb81fe9fef2f16e9ec2d4ff355de70d21b325dd6058c9e7a0a0dd3e41cc168a251784ab7a473108d272e323470c601d5839
 DIST swipl-8.3.23.tar.gz 11162363 BLAKE2B 3808da5bfda1059332dde6a134c2c014c6ee190791ac0c1ace6ea6713719470c1f63df9cf25bdfa69ab73a63090d9d4e37a3afee3b0c107786568a7786c5cbea SHA512 ca592bfa815496d3668a3251f3249c578df46185d856df7bddb88786923fd247542eecd8505181c5f6d4cbb9ddde0d54177d053ab7bd8d024910ccb3f00f7430
+DIST swipl-8.3.24.tar.gz 11202181 BLAKE2B c5ac25b3cb73deeef51b8469977e9554ffc9da275dfb4541e7f653fb3e3f411abb971fc66ebf77d662ecdbd2d57070b18b76200f7d26d649a491a6789b807ef4 SHA512 36c436088e7eb78147d2e61fb6377e1703b5a1a6290e98a73810d18e07bda2b598aeb7aaff22b2a4caef90c3873c7a06c7ae84e71bb5f52cc2c6b315e4680f28
 EBUILD swi-prolog-8.2.3.ebuild 2637 BLAKE2B c160e9ed130006f0696118245abaa1d635c63ff9d6fc3fe4fd6a60fdf62bf7250944a5537314be87b316017729d5c351cb30ecc5778f3839b701b5126969ed11 SHA512 21075e6b11271548c377870daae5d82a09a91aa13e86bbdbab49aef53a8621523a65e9a19f02a1bbb559d16533b5244f2e8e500c02e6a6f7f0e681b8c75825cd
 EBUILD swi-prolog-8.2.4.ebuild 2830 BLAKE2B fc2d901e420fc8c9d842aa5ebfe9494c907f0529a3a6bbae1d96fe05a5b4840c953f1d3022b3d8c83d151df47073615e6120445ae7dd65e11237228c9fcfd2ce SHA512 b2dd922607b75e31e02ed48da294a2d06e3e707d2b479cc5b55569cd80b4250c01f84c4d8d232b94f46c51f637294347a2be8fca461f2d76cbe537897d13627a
-EBUILD swi-prolog-8.3.21.ebuild 2443 BLAKE2B 8bd9082f8f72b9c996411727d2901ac77ba8330b8602dd5bbe4d8ccb19e27e5be8246bdc233a7c56e07dceea970a5393a3e12584a212e45c61a9c6bddcc31849 SHA512 42bf0ca6938893134a38ecbd9ed91efbbb04361537f61e2e0573e76217071d0ba768cb0ca7d330acd4ecd4763cc788b2de8e47747446d584447cfed67f55608d
-EBUILD swi-prolog-8.3.22.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
 EBUILD swi-prolog-8.3.23.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
+EBUILD swi-prolog-8.3.24.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
deleted file mode 100644
index 914c832b3536..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.24.ebuild
index 2a8883edddfd..2a8883edddfd 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.24.ebuild
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 2b7ce467f51f..247de78f6434 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -6,7 +6,7 @@ DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a23
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 EBUILD vala-0.44.11.ebuild 1112 BLAKE2B 481c622dead6198dfbc11fb7562b71e6504ab65e3ea354b4a575d138f4a881a8f1f1ae79a0071c7c965bd18c58afde0f79e37d9ba7947858236b408d72e38e18 SHA512 61983430919c70f1524f399cb2d45370f3efb2bd7f6ca347a4bb637062fa71b64cd8507fad5e10b1d6e9a9b2f70808e4cea3c93a2364421a888cbbd719f4110a
 EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d6243c3510e36e556e5e075ab1caffbf579b2a661bbe6470eb24480879928714529a5f82b9d83b0dcbdfd8df7 SHA512 af281ba4479a81ce7e825df237d55e7db552a2f341fe27e0d41de4a0796d0e3e153f9eb01f7ed0ae2b070b5a2ccee6bc7ab32d890ba0ab99d6cadbc3ee14b33e
-EBUILD vala-0.48.12.ebuild 1305 BLAKE2B 486479be7fc63ca09465495fcfc6dbda8f8f24f249f29fe43d4165d252ac29058624964b9a6d6310144aaef5d93c6deca2210a7b2bc97557403b1d22003cad05 SHA512 718197b4d6a6de87201b4764c03c4427e8cea5446d155ca250fbe827bcf5b1d3ebef63c56f49ffcda84ebbab33fb6fcb57db8cc6ecff6a7c5d6993b51bf8b566
-EBUILD vala-0.50.7.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
-EBUILD vala-0.52.3.ebuild 1325 BLAKE2B c22b1e6b1bac1cde9957bafa7d4a6db9500d502e3c0cae0665d5371b62fac47d96c1db1ec7f070cc26a5d800421079c4e35e9d63ebfa0d461f9a5b4b355ee6cd SHA512 53cbb0363281f5938bc350a3546fbdfaaa94096bbed408aa49335f836ea12053f86eaf73af9e581e57a4fef4cf97fe07295b7111dff3964070a78b84284878e6
+EBUILD vala-0.48.12.ebuild 1312 BLAKE2B 5acc6c67a78ff5aff422e44980db6072ea7f1311f46b107eba95ff2963b78518c2a60136c06fcf6da996cdb9bb222c7c9bda56c84c85166d7a69ca885b4683ff SHA512 78e461a215adbdfc7d7ae7ccccc9f97e1b408a133b0e33005841a74169c57adfc624e12ec0fdab9434ea6720649c3356e90cf9af79e698c2998fa93daac1290e
+EBUILD vala-0.50.7.ebuild 1319 BLAKE2B ef3519beed7bfee6dbbdad36e7834edb77a02e1f5a64f576a5cfd84c9098957b8c088e416af08d1f5c250076bfe77a978cc46f068a676a3ec285f0ee4d876838 SHA512 0623b5927a76ea0ad57ed060d8b7fc708779bee539a3361d4f2db13b01cff4d3c9ce4eacbdf2551146c457060f0ca337205d0ac061042fdca9610542ea6a9e15
+EBUILD vala-0.52.3.ebuild 1332 BLAKE2B 07ebd950465ef0d16801dadd56096d7fa90c218c4e6dd08a6fd9fa487207701c02511c418d210967be351c12c757c342f268cba6f14ca97bd66087cef7ca6ab7 SHA512 e48dd90cd3daa8c2c6eabb13a1f00fcb636efa72c2d7cc581044692a2e78fc39b8cadc47b9ba46fead9f5f258204f25c16358ca81b3f4fa33d210fa6da28e2b4
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.48.12.ebuild b/dev-lang/vala/vala-0.48.12.ebuild
index 98616f0f84a1..40f0a9b81914 100644
--- a/dev-lang/vala/vala-0.48.12.ebuild
+++ b/dev-lang/vala/vala-0.48.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.50.7.ebuild b/dev-lang/vala/vala-0.50.7.ebuild
index c1a73c907f81..bccc7e3dd84d 100644
--- a/dev-lang/vala/vala-0.50.7.ebuild
+++ b/dev-lang/vala/vala-0.50.7.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=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.50"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.52.3.ebuild b/dev-lang/vala/vala-0.52.3.ebuild
index d3cf852fc947..fa44e86dd988 100644
--- a/dev-lang/vala/vala-0.52.3.ebuild
+++ b/dev-lang/vala/vala-0.52.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.52"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index a5ab438def10..0d5cd811e07c 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,7 +1,7 @@
 DIST XSB-4-0-0.tar.gz 15340635 BLAKE2B 4832185a64c6c5786ae78e111c25cd3a5ffc2f80aec9c0c83f030ead482868c77b0d7abbfdf0d113b56fea395eb7e69ca2970a82ea70004fb78c0bf4de258a9d SHA512 fed1e0db4874db2508e0c1e716be20cbfbc4f7ed4c16e0b220750cfb3dfceb78bbdce0f8564b68c400af1bc2b8f9e3b35014e8849bba1705bddfab824f41e816
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
 DIST xsb-3.8.0-gentoo-patchset-5.tar.gz 7748 BLAKE2B 291beb7a2bf567708119eb200e06fd0d6ac976b5eaea9646d9b5fe9fe67908e01f48b1e55e36fc98f7fe75ee4b654422bc0f9c565e00ac75fe36cccd0439bc2b SHA512 cd3762545bb0b0c5532607741f5946658cacf062c21913c8261988a2162ab848d860ae5a0d11d7a4b8b36994f7fbc91c6e6b4fa607e8cc6ebed434dbf421dec1
-DIST xsb-4.0.0-gentoo-patchset-1.tar.gz 10284 BLAKE2B d31322bb3072e806a000bee137d1a6b89d6d555da9de1b24f4a319cbe6a6bf6bd097a1ec8b831fc50a5bb820c121ea197127248e2206719082ceead8d6b5ad24 SHA512 d904741d2deb49e613501affd1a02adf5a6449edba79e92efd8b18227c274f4bc9385932894b11abc7a714e56511d41d828871b4dd0a10f59ef53b9119ecba1b
+DIST xsb-4.0.0-gentoo-patchset-2.tar.gz 10410 BLAKE2B 672d5fcc24726fb90714adc80a8346101a9f42845cdcb3e5ceba75da1bcd5219f5073d91fadb0e1e01917267f1039970a9a3f340d63e6ce0580b9342bb7ae252 SHA512 5ceea28d746f2e7ccb23768fb6e9fe0e5c89f7c62d1da2964f376f6fe8999e06af69b4c4621ca555e6c553f23bd41b5a7d971e7f6f2d6d4fdd023f874f5e6c1a
 EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B f3cb8e31a72ba410cbd38ca3da137097bca0fa5bce2799d47b848a12c32dbd4918cbdc440df570833ff377b85c565ff8417d7d244a7421989508df4ae2c837a3 SHA512 bec9a89c10256988a9ab42ebd75ee25fab4acf0eb3cf08614e6644e6dee8c49e3d95c77095fcd31fbd017b3c53a337d30efa418a4129570b8d2c2268704d8250
-EBUILD xsb-4.0.0.ebuild 4170 BLAKE2B edbd405f53a2dc1cbb982cc67dc6853588fcbba53f4c0f561dd902e3ccc89ffe80323dc15ecae1b411372aefbed5bc3a613b97377fe1cd0a8553caae487097ac SHA512 0f10e9b051eb2f37a686d6b0a79abd21f672eb13806d2c33a26e689759554874c4b6320a841823a5521b99a2689747eeb1768c353dc5eeeba1bfcba34ebc7579
+EBUILD xsb-4.0.0.ebuild 4170 BLAKE2B 6d578ba65326734ade716f0eee25cbb3f8ccf7399dd7eded1414985caacd2be7e23af2984bcd493795d0f88dffb4c081d38eeddfb9ec97605a6e291a1ec02865 SHA512 62d63b36ce69b6c5144ac9a6a5f38f8af4286f6b4ee84d9580c2def8aea987883067c5e07838de55737124de800e3920b09e0a4dc14d529f87010958dbd04171
 MISC metadata.xml 406 BLAKE2B 6fe5156e6490f7b53a7fdea57bf5d07d3122be79d0a24bb462b6bdc46bd5206a195526c46bfc7311822988e82df46aa9a328cb2eee289d786120b160800c3dbc SHA512 d5d676b6f4d39acfcc17ac2e3601608566e92ac0cfdc071a1606acd7eafa73024d57a07ef7dc009c2e373825552f659befc84c975502f832e588379748ee287b
diff --git a/dev-lang/xsb/xsb-4.0.0.ebuild b/dev-lang/xsb/xsb-4.0.0.ebuild
index ade1cadd4b35..888bae91f99e 100644
--- a/dev-lang/xsb/xsb-4.0.0.ebuild
+++ b/dev-lang/xsb/xsb-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 inherit autotools java-pkg-opt-2
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 8769d9841b19..a8403f8c500f 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,4 +1,4 @@
 DIST YAP-6.3.4.tar.gz 11007893 BLAKE2B d8024fb68269bbb4f9a434e2be13b4a42aa250f7e6505ef8f6e4c76d50510e04e9a2985796ce66b1d426a877646eafeecb30774c353f5a820c32dc3cbdf20b1c SHA512 67884b98bbc564f23f88cbb1462127a47f3d0602ac347d1c8b0857e5d8ebd9d0ca28770229a6beb52493c6c3256b6cdf8dad25ed2963c64102093f70c4c20a3a
 DIST yap-6.3.4-gentoo-patchset-0.tar.gz 5165 BLAKE2B 1f6c9f91f2d2c0e9488f26e1a8079a40ed30c1c83c7171024dd0c0115874e336bbdfa449246e363d0030bd05dc0d86e9efa19cc2fdc4d04b96faeb33b9ade9d0 SHA512 a2a39869042cb647dc022b34a4dd0881a6a35ad0bf88527380d6d74e5307f9dd0ab5feea8e9e922524e3dce39132ab6c8cadd78f92735e2c368d7b277cbe6944
-EBUILD yap-6.3.4.ebuild 3426 BLAKE2B cc8cfb8128e28abbaa21c607d03da74e8aad700d1ef19695500c2c424d2a4fe8458ea477be0b3662d2291030f8a37574dcbec24a2d8a52ce3407ead4b98bfca4 SHA512 2c26f3c19eb2ac97f0beed22f368d68b60c84dccd4c8329b65fc3facc4bb0917d7446678a8dffcc6f93b4995d744fecf628fd247cff12d9fde2a0856e8161519
+EBUILD yap-6.3.4.ebuild 3324 BLAKE2B 498392f8353fa5a6024caef9ba1b8dda4696eb1d3e649c549486d6e5169539ca36384cb5eb7e3d86db95e8212529652e31a27f456ced6f21569bfb41119cbb57 SHA512 0488ee639f8a471ef96fd44ca2f7fa345d4e21698274921c7b0861bec13c0b2d9c01caece69199d921f64ec938d9f56b114d038e24074950aa735f9038636d9d
 MISC metadata.xml 388 BLAKE2B 6664a3afcf7d766c6167c87d139aeb008ebf1525528dbb8b6b0b9e051279a60083a3858149aaaf579563c8ddc12b3c02b9712b37d52244b659eb7d953ba946ad SHA512 cdd5e0418ac4fd525d5cbde6982591d542d9accbb48e4d7726c21257dfb114ca2c7438c2c9c914368fb407ab32ac1edd02d918689ba8a1cba4035e20135c64dd
diff --git a/dev-lang/yap/yap-6.3.4.ebuild b/dev-lang/yap/yap-6.3.4.ebuild
index ffa33f604397..f45b3f336d34 100644
--- a/dev-lang/yap/yap-6.3.4.ebuild
+++ b/dev-lang/yap/yap-6.3.4.ebuild
@@ -7,7 +7,7 @@ MY_P=YAP-${PV}
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake-utils flag-o-matic multilib python-r1
+inherit cmake flag-o-matic python-r1
 
 PATCHSET_VER="0"
 
@@ -45,14 +45,11 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )"
 
 S="${WORKDIR}"/yap-6.3-${MY_P}
-BUILD_DIR="${S}"/build
-CMAKE_USE_DIR="${S}"
 
 src_prepare() {
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
 		eapply "${WORKDIR}"/${PV}
 	fi
-	eapply_user
 
 	sed -i \
 		-e "s|\(set ( libdir \"\${exec_prefix}\)/lib\")|\1/$(get_libdir)\")|" \
@@ -61,7 +58,7 @@ src_prepare() {
 		CMakeLists.txt || die
 	rm -rf "${S}"/yap || die "failed to remove yap xcode project"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -92,14 +89,14 @@ src_configure() {
 		-DWITH_Matlab=no
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc ; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 	fi
 }
 
@@ -110,7 +107,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodoc changes*.html README
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-lang
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)