gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-devel
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
193 files changed, 896 insertions, 4970 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e6f445ae312d..e40a8c10e145 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index 52d4d1459428..1f4b79f9e6d3 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,5 +1,5 @@
 DIST autoconf-archive-2018.03.13.tar.xz 649496 BLAKE2B a69c381d734aa41337b8af783196f13e7aa49d936289df237c56a9be7662cd2b766ac42fa10f4cd46feac3998a12c49745d994c5df95b5dd449646dae300a8f8 SHA512 301832a02b1913dd46cc34f6479264b37032d78457b2df526f0aafc752996972ca9c74fdae68fbe0f490268019c45329d564f263cbaff30203bbb4b4a8d5ad5f
 DIST autoconf-archive-2019.01.06.tar.xz 651320 BLAKE2B a311b8e6bdd45337194451a696e2435ce758e7c9b1d12639b5837f23c8ea051eb63152952fb944b14fc1db1baa1f1a3e3516fa931fa411b0f7aa08a2040ddcff SHA512 14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb
-EBUILD autoconf-archive-2018.03.13.ebuild 715 BLAKE2B 6c7bf5505e338575990cb900d3470230be5d281d293587b36a64eb52e3e4e7ef0d2bd8bcd7a10fe52ec031a102c8c23e1f7b97aa08b8a33bd997e29d6b95ef70 SHA512 7e7ce1a0da75dc21a54f860db5577ea898fcf3ac780f39fef8703a1749e78f2e197f5bed2fee5e1947b353a8164cd092ddd8d0016aee420d6cd38a1a22b5232f
-EBUILD autoconf-archive-2019.01.06.ebuild 668 BLAKE2B 0c88f48c347fc88438d5048a645ed26bd66a80a30b606b7018b90673bbcb26e005d8f010c9fd37766d345fdd31c8658ba54a4814d29ad8f61138c2de8a736f5f SHA512 f3ba2c2b15cda796e0b12bed308c911d9c7eac32f7a76e8c7fd05b95ddfa8297938db03dab6e334103c3574165aa2c8eaf9c2d4b836ab36ead5304a133fad550
+EBUILD autoconf-archive-2018.03.13.ebuild 713 BLAKE2B 5ba069e74be043c22526debd81cec081b43d2a565cf5bf28edd1efe8cc0f0740296dcfadb49e4b61454439809495eef38f9474b25d746376655cd62c680cf3dc SHA512 cd206122e994e4e8ceb2506e417ca20df575c29636d487def94dc7a8e0f7bcc93eacb28c12a07ab161b30cdaee73f66e9c98c02f15eae909d76f62c40de0f7d7
+EBUILD autoconf-archive-2019.01.06.ebuild 664 BLAKE2B fda95fec76f0cb908082faad2ae921f910ad14f2e0ca10f95ae093fd310b8286e26ccaf74f303265a1e5d5d2c6afb6e4b515b0ed43e383bda9cb0e34a8989203 SHA512 63fae75a585c0a34c42d5a5cd8528cb8fac2751053b68055ddb1e2a1f4e0c35bb97233a90fd22e2ae06a2183845c3ed0d8ff0151c1f23f5cb39b897207f672d7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
index 77da6d6841c9..e5c309ebda21 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
index 4afd97d7cbfc..5229f079b742 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 1acb9e59d006..5e68ca3315b3 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
-EBUILD autoconf-wrapper-13-r1.ebuild 817 BLAKE2B 337bafbcfa0f817ba4737c6b76c9aa89eebfd496ef4f66065773545b066dc6bd47886ff914772297a4774ac4aea148d80b503b19c590c869b24d0711345c3015 SHA512 e5ff106487f8fcb953ea38f918590e03c698326b59ddfeac307a9a719f60d04e768191e9a1c168d06d1b58d4e64400b2fcd14635a03690d7b1cb3d411281d19f
+EBUILD autoconf-wrapper-13-r1.ebuild 815 BLAKE2B d7bf44c3cd21c9b23b9a4fb89ae25b30f687e2aef7a44335df894409d1d087f037e5ef1278b76d1cada5f75f931cd13c5185890d3261b5f7e85888b2ed37197a SHA512 4b82f9e07a79b218a5dd9b0950b99ea9b62d134d2c0b3553d1d5ddc694cc944ae0e0c8d286e9ed833855b92f719522f02dd96e7f01853a7c626df40697470b30
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index 94a1c8551132..a36b9fef321c 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index f9ab1d1b5419..3775e0ea13c3 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,9 +10,9 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-2.13-r1.ebuild 1540 BLAKE2B db79ec64d88cf5110cb4f42fe496d509bdcf144b2d717394699773b0518856a11f8e47f4b8d234794123ec11c707497c246d57590d786bcbca254df2938606a4 SHA512 d0cd2811ec199e8bc2a85f147f721241f9e4d8512e4a6df15394ed0392ee378d82178425b8b041c8c57b2265c708bc33f6d82b62b60453afe806b6b3cec44127
-EBUILD autoconf-2.64-r1.ebuild 648 BLAKE2B 8b6af915b52f755aed06d34b6cd8e22b2ad3934b2814313f4bba9ed95c547b35f90ee13307927cadaac96834991bd64f13a6117f5b50dad4355d1c6413acb537 SHA512 c53401d4baf2eeac6e9d2337db0778667844f289ade9b9f9f40404ac46bc5c5e6e0512a2b68cbacb380551db4d7ff47f13482667c5db095c0e7339bfb0596d6c
-EBUILD autoconf-2.69-r4.ebuild 1332 BLAKE2B 3a57cec3ee1a41c94ab9629b779cd84a6ba56a3498025864cfa040c5d1199dc2c6adeb3b41a6a5c068503b8768814d898f4d7f71a9dd2e01a7f52cf8a961aa4c SHA512 7fe32cefe1b2e728ac87e8ec38aa132f480beb26f465db085bc6781a6637b2e2c8268b41c69f122d5d46b66524c30cc570a5903d20b5c2bf059376a32188c53f
-EBUILD autoconf-2.69-r5.ebuild 1809 BLAKE2B 3063370dc5a8ff60bc1ce5d4394908479887b198f761f80b265aff2502e14d7c5b7cbf49bb375b741fb369d962134cf6508de096f13e631a0a009746d026716e SHA512 f676472c53a7e6c52c76e3f0dd577547902b0a5495d59c099175b846a20b90a1cf4a4c2f6720c24443d236ce4763e7762c22d3a887e003cbcec1c9c1ee30a723
-EBUILD autoconf-9999.ebuild 1205 BLAKE2B a7c12326d20aa0b7f874b8a7e7da3d23288c0dc80f4333761538a4117839a4159747b20f18ce28a0fb0be48b81cbd85b9d7ee18f81769613c92a1655b090cfae SHA512 d63fbac3e7642caa702d3e3201a004fa39291b6ca9237cea58f62f4c4e45686f4f5553f73c3fa44a6cb6c4f5b60a7ae39a0366337ba3423ecf73fa3cdb718157
+EBUILD autoconf-2.13-r1.ebuild 1538 BLAKE2B e52cd46dc33b692e9c990130e455a31983873bfc633a53513242d92c72b94af5f5493fae4c2c5d33db77b3f67f554b3eb981d6841873e0fd6f9421750172d276 SHA512 8cb5d8a04a78d88d5819038153fd47b4088e9dc7e6d9b5bd28aea73e6bf5557c3a8144fb499ac6d2b0d11d2a004f91a5f608960e71c62e98e66d9bec520669ed
+EBUILD autoconf-2.64-r1.ebuild 646 BLAKE2B f69b65420552fe19a98df506ddd21933fee9dce9e1ea49d1a72238ed7280427252e0082af2d5eefc02727a24a1b22957170968060d360a32ad71c40f014099fa SHA512 87be9471ac6339ffb9a5fcbc4cfc40b6b35eb5463cef1019ee3f4d901c1e5ff0bb17a4e056b3e3756168ec1acb42f787190379709cfb04164624e7df71841fba
+EBUILD autoconf-2.69-r4.ebuild 1330 BLAKE2B cfe82dabacf9e1df63e44d4a47eb3cb755837660d0c12811f7051ca21b4065c22a5726d3863da5e48aec6ac98395ff748a6626a476a88cb59d330fd049d62ad5 SHA512 224f0e5db91e7f3b2fa8a94d7f7770b406a09a223de2a4614e978bf7105e6807ac095257f9de8751890764df8fb8ae8f44317f945897558c50159781f7adc02e
+EBUILD autoconf-2.69-r5.ebuild 1805 BLAKE2B 006a2fdbb1de006d068a5d32e0fc7ad287e489b5403fb372a6bbcffc5504b6b344cf52c5c1e2283dfcec3b430c2a4db89c9347cb1685df94c1aea940e9ea8494 SHA512 1b6d01f3be4f96d015d7d566766538c48929007105ac160ad95a5fec7ec8d91fe5f258d91132de299484df3839a2f8e81d84aca4f7af3f696f00f21262348a9d
+EBUILD autoconf-9999.ebuild 1201 BLAKE2B 54056afab7ae1d33423957ee088defa5210313283b1287dadacd86291e8029b2337707c75bc28cadb9c33c5933ac94142684ffed93112fffff5e59aa045a1cc2 SHA512 5fda1ae65b6831eaffbcb1ad1f63bfd0cbb98aabafa0abc183038e394931d7feeeba98a5d9824a54ca937aa9f62f332b3b363970b7a239c4a81faa0a3a22fb0e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 2e95a1fc1bef..cc743ff3cab8 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.64-r1.ebuild b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
index a6daebf12324..85013f5055c5 100644
--- a/sys-devel/autoconf/autoconf-2.64-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index c70a97058580..913e5ce1fa95 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 190228a86966..7694eca770a3 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 22cc7e63dcdb..155a08e8f7a1 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index cc3fc7c1ccbd..3ff4ee89e4d4 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,3 +1,4 @@
+AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc90cc47412ca79fa58a29ecebd6ba1f201aafca7262c7eec30749e684148ae845fb1db1f8687b15b9a332e12462a12a0 SHA512 27489e5fd3a9df979a43c479d30e8566e863cd70d20ebf5788582aeaf8144912b7153f42f8df7156cd11b21ab849ff984f5042667500ee041af76de85a8eea3e
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
@@ -6,6 +7,5 @@ AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a
 AUX autogen-guile-2.2.patch 1033 BLAKE2B a18e884010f48b43b17bb5c78a4676a364503943f5144991ad2ab6acb8a9ba6f08044bd613f0763b5c863b380ecbcc7207df6cd29d08da3d034f07a386204bde SHA512 19c25fff1ca0427ff18627a14dab223b92da8670487351808df892fff77a8e33895e2ecc51acd8b03f3a89a5e19813fa12fb93c0aa54e47796812e99fd4ac7bf
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-EBUILD autogen-5.18.16-r1.ebuild 1887 BLAKE2B 480d7158392793a40acddbbe6554ff136af5a6b5574a575c4bf970c04f570f4c9d2e4d5d815916277bd003fa6645e03c2ad1c56a0495e36b80547a749ee8cd85 SHA512 933945998b67f7d1e8a5ff8d57ab11c7fe68ab5cf31a818a921ea5f349747139e8659a5cd43db035b3df140de513717335cd96d886a92f4edd4b7cbcb2451f62
-EBUILD autogen-5.18.16.ebuild 1546 BLAKE2B efe55c13c8f5fba579dbdf9cf7257e2685ffb68e1fc48a3b3e9eda384bcd7c852acfb783afbf2ec2e3067de586fe61293266e62c88cadb44dbb834215e660334 SHA512 673b244d04ed4996c8e2464827fde72c9901ef678370f3123b1971a5428aa2403c4962949849f6a579fc74fb5a184e7f8ad16803206e4fae9b0574ef120b96b5
+EBUILD autogen-5.18.16-r1.ebuild 1928 BLAKE2B 0ebeb5529ba766673b297dc8d084593255fe6505cf9bcf83e66b883be8f78f721be6ef7156bc14e911b1c3aae27314bac33315abb06cdb63fe82712c45dbddd1 SHA512 1cb2e9d9baa0b1265a750089a4bef2649088b3b188aba40493231bc7da31207fc04b2051cd4397507496ddf78413043103d03f285a16790fdbaace7f5588bf3b
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index 93712b018dfe..fd490fb216c4 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
 	"${FILESDIR}"/${PN}-5.18.16-rpath.patch
 	"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
+	"${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
 )
 
 src_prepare() {
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
deleted file mode 100644
index 6dadf34a2187..000000000000
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
-	https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-RDEPEND=">=dev-scheme/guile-2.0:=
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
-)
-
-src_prepare() {
-	# no-werror.patch fixes both configure{.ac,}
-	# avoid configure echeck
-	touch -r configure.ac orig.configure.ac || die
-	touch -r configure    orig.configure || die
-
-	default
-
-	touch -r orig.configure.ac configure.ac || die
-	touch -r orig.configure    configure || die
-
-	# missing tarball file
-	cp "${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h autoopts/verify.h || die
-}
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch b/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch
new file mode 100644
index 000000000000..a91fc8cc7928
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch
@@ -0,0 +1,19 @@
+Without this change 'make check -j9' on make-4.3 hangs indefinitely.
+Older make versions just leak process. Ideally 'run_ag' (or 'defs'?)
+should be fixed to stop process leak.
+--- a/agen5/test/directives.test
++++ b/agen5/test/directives.test
+@@ -120,9 +120,10 @@ echo '#assert `echo true`' >> ${testname}.inc
+ run_ag x2 ${agopts} ${testname}.def
+ test $? -eq 0 || failure ${agopts}-2 failed
+ 
+-echo '#assert `echo false`' >> ${testname}.inc
+-run_ag x3 ${agopts} ${testname}.def
+-test $? -ne 0 || failure ${agopts}-3 failed
++#leaks process and makes make-4.3 hang on leaked process
++#echo '#assert `echo false`' >> ${testname}.inc
++#run_ag x3 ${agopts} ${testname}.def
++#test $? -ne 0 || failure ${agopts}-3 failed
+ 
+ ${FGREP} -v '#assert' ${testname}.inc > ${testname}2.inc
+ mv -f ${testname}2.inc ${testname}.inc
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index e4e4b97217f5..36f078840c37 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
-EBUILD automake-wrapper-10.ebuild 917 BLAKE2B ee0681a19447eeb076dd7db95944bd1d9526f7002f78673e1300775ed10e66117484b56601cdec14bae158a37eebcdf466b98f0ccec5c223182eee38a7079ad3 SHA512 d228c2549118613fa618155782f7144c4e5c7f29fc3b50e8dbb3b81bd28472ce701af3f71fe5f065554533bc7dcaf42704c78d3fce01b603649676a0cd52277a
-EBUILD automake-wrapper-11.ebuild 929 BLAKE2B ea7e260b3c276025f218c30e987b0d5b15a2ed23a38c050dc6724e65d5f0e51e4f95bb8946189bbc13baba9ab8e2b8f061132d102837d11a3efa94882039e642 SHA512 c897a5c54ec3b8f0707f5c4a5dff92f08e4d8f405858cc4dde8d27177b059eec49009a45dd9e219776e2db0bd6946c2bc8fb637f3fd9c6644cc1695f2f47ad99
+EBUILD automake-wrapper-10.ebuild 915 BLAKE2B 81debe3ab1addc9198eab17ae8d0d6fefa339f071d769f4c1d3a55871efa9b50af2cdaff0a4efd7f95ec39e004107778de05a0cd7d8a414df50cb892a14fedc6 SHA512 381f82477b1e36cc7459abbe2328a4c186757350b4f4a256d42256ebb2b5afd479f8416f667a8f1c64ef5f840bdf26a514b80f2ea685db1de53c1ad8e4c0909b
+EBUILD automake-wrapper-11.ebuild 927 BLAKE2B 7804dca4cb785d57c9c7327ea843c9f38636c0e28dacc4d3692986f0a2587840464efacdfdeac5f0fea8a98b06ead98cd59f4c07739fbc85a95bad98c5d5c044 SHA512 993d8bf7868eb385fc543897879cb465f56d323109883df373b4c88e68326bc5b948a0e11b39e6966d0af7090a25e9f1601821d0c9de041380736beb982f9a99
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index 6f74f32cb992..4d46b48ab86b 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 61876131a8dd..430695cb0c5f 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 75071336c44f..4cdfe34182d2 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -13,6 +13,7 @@ AUX automake-1.16.1-py3-compile.patch 2043 BLAKE2B a7bee250f6dfb9281ca6b448b2f97
 AUX automake-1.16.1-py3-no-pyo-files.patch 6197 BLAKE2B 4de9f40d7bcf77602678ffe72a7c58d41bb0b82e142d2d289f3336623360e2d2565cffffc8f5b344821385fc11094f4a5bd873e3b0194393bcf6a2c8c67e613f SHA512 93a04a654cf3b036b40df72dbf47270b022ca2638a0b9dd8ada7b5f853fcb4f4ff4a22fd34d2d8e4c13c80cb3983813f52a5770de99b9da17a4837059cc56a5a
 AUX automake-1.16.1-py3-pep3147-cmdline.patch 599 BLAKE2B 0bdd6885e8856905b1389facf2792f6e4752a2c16e3b478e05ad897ce9e58f0ff61b160065dcc18bad28c13cd1e8d42948681f600ae9e68ff7e8c9d5b2f8f6b8 SHA512 eea764c559e03a6d5788745e33a5aa153664107451a3ec1164621a2cb69ddcf30bf81de76b9b8f40896f8a0d5406a02fe638d4d47aeb68226c5599a7ca87147c
 AUX automake-1.16.1-py3-pep3147.patch 1565 BLAKE2B d1de92c94bd37b439e09003f27729c892c6ed7d807c70d6774f9bb0379a771059c1816c4a4fea3e88717223fdec557d20df914211e62e9e2d009339344c39df8 SHA512 f8a22e014123dffb442786a1f18f0623ed3b4fcb6b90649607c2ceb7f8ce0423181a83f9f15a575cc8e1408f812349ea3c33e89028c0e5714a152cfbdbdd742a
+AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
 AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31
 AUX automake-1.4-ansi2knr-stdlib.patch 249 BLAKE2B bbf77d9aba954d03cfdb896c88bf9fb98695951011f885936b9df29c522d5ea5d46ee1441d37c7e367cd2c7429a2f017edbf4645470f55c55a7c50b0a7b2ae50 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c
 AUX automake-1.4-libtoolize.patch 542 BLAKE2B 25dad3cbd948d1a6825ba800756e1a6f67ce0be86d2e33d345eaecd5e7c6a7a6e6aee213eb89cb9ce83ee6abf550c96f2ab2d17f32bddc62b95abd4003d93417 SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846
@@ -45,25 +46,27 @@ DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
+DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
 DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
 DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
 DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r3.ebuild 2354 BLAKE2B 85cc6965e328e41b6e3c8ee5530506a6cbafe72732ac6fd7f5bcd0fd8a21e6a3d1c49076ed86eb8c4ea63f48e22bbaf8fa69e590fdfe1f2b56e9a4f41e7a5d2f SHA512 b02757a88969b19e0951e9cec11ce81a4722c2731e619dff7e7cf6fba4548ada50c79d67039fa770f35ae2a52301b6690658fd9cce6bf7e2ceef1805927b9d94
-EBUILD automake-1.11.6-r3.ebuild 2585 BLAKE2B 320c89c58b1c655bfd5fb735da6ad75fe4b80ab2fd14afb7e5c8fa0ff0960779186d748c3c2a416e1434ea06cbe1046451e3fbcae46766463bf7a58064d9c3bb SHA512 2fbaf5cdb7f012225d7d6b05936041fc2844b3b0755e88c64b35ad6c2ad71c130acc58ce90495dc0129ddc39d8f3e880b0f26bf884fe365dd65aef6fe7d54960
-EBUILD automake-1.12.6-r2.ebuild 2367 BLAKE2B 914b206b52e052ac1d4efc0f59d6428668fc1a0447bfbecf44e4d14f0f5f247d57fa781a6350fde3b57f09eb647caa9972bb56c698b43619a4ee097ef1496803 SHA512 66443b63a83a4d48db22fe3985adc358678aec70eb1a81d28a3508f91e2039269da9d105648af38ba8743b94e40fd0c104884edcbfdd81a637279431a431389a
-EBUILD automake-1.13.4-r2.ebuild 2620 BLAKE2B 6e88ff0a6c87d842b4994370578186310b9405f6c67df70b3dadd5667a702cf7ab894fdd2e0e7181208f9126a3bea251cfdea266691b1252f2312a4d81ac4f89 SHA512 fc41b7d34e3ecf12e7947fee32e3e9a25d28053799061c548ab37b08645ce1d063aecd21f4d82c23b78b8213f13ce73bf86c2693da7fc7d4dde69e9ce845ed4d
-EBUILD automake-1.14.1-r2.ebuild 3039 BLAKE2B 16f87489ac9711dd8db315fce82c7db8b0609bbb1810b32aa70b48360544a9523bceebb51b97b2b389aa5b6b2c72f7f256f12633e2b1ea6ab2d163e8dbf3f77d SHA512 637ea26a405fb135368f2caf45962777208f05297b6d33367651edac78233f09c655177d1b46843c2bfd8f28ac2185c5736c880b34259e2c0ca6eef8d91e8d2f
-EBUILD automake-1.15.1-r2.ebuild 3209 BLAKE2B c2d6a0e5a19915e3d105911d5118be239db0027d15a2ee652b014e2a3f8c45dac4d4fa2c9b049ee0ffcb1cb28735a795afa6fc86aeb033c596aa191c2bf71304 SHA512 446a326b5a05f27fc09f1aa45fef1fe129bf5ae44ecad85d94029d0edf23c3be2cd6d0cc2d71cb1d081f31029028403c578a2fabeb556fa4d25a83aa41c6f497
-EBUILD automake-1.16.1-r1.ebuild 3134 BLAKE2B cbed246bc2a85f065d70b4f4ca5dc03c6748fc78659f83a1e360e5b17f4eb63df16f8e1b879ee7796479d6837626327b27e77fbb9ef0540a8ae94657339df11a SHA512 1b97f67c8ed12b96a9ff507337d4ed5aa567edbee666582f2d515ed7132be452e0f7607a73857606a341ac957217ea85510a253c79b4f7fce517738b9ede8a38
-EBUILD automake-1.16.1-r2.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
-EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B 41f94674d765a08fedcc22c5468a02377c033f227c4addbbff2ca6d4dfb1f9c2d2f4183329a4d76b7c7382cc9b9355b4d111d5e2d5ade2e39a3db8b141cb0d76 SHA512 1c8ac7600ae5471d48c86501d857f9be0d1c25acf81d12f158385e767276dd4318d63d3861d331a6c9173e9cec4217c0a33cdc42c292d468a3549cf83ee706db
-EBUILD automake-1.5-r2.ebuild 2287 BLAKE2B 638ff4f16048b4212936eb28f97cc12b120f96697e49cc331b7da6724f76bcf6420d553110717b400c32af556e14128e04f9859922b75fe8d962aa2083afa541 SHA512 9f1fde01978eedba28e47f7df8ce4c85ddb4bdd4e0b76c1ffe4961b21d47537b8dd318aa0f9d22af3c14ca2fa61e7a730725b27da6c1fadd5c4261781f3ed0d4
-EBUILD automake-1.6.3-r2.ebuild 2035 BLAKE2B 1459a94e9ab8173e578ba19a23225582d5d4f9d7bb82b40689017b2fbca7507b5f872df5d5002dec76eba18e039466ad9e019ea3227b6a74eea7855c5e9e953b SHA512 1a5770e826d4d0d491723c64e98ecb98659398095ad0e8e5c41f701679467086143e7068ff451419bdbf447a0785164310f46f3bb519e744bc6b5c40416c788c
-EBUILD automake-1.7.9-r3.ebuild 2190 BLAKE2B b01d99dfc567e55063177b20ab68ae8ba0c73bad7886d141bfff2c300c9d454ea6fce5951b31ffb717c5645ab44790e03e1c3c87793c77551caa0d7d2aab17b6 SHA512 9c1bc433d90599ae1f71625d4d57675d9d352c8b228d1032de16a5d3f97907f44dbab22c9339878c8e0f88f9c54fbe4c68eac66182489b5add6ac32ab4390dfd
-EBUILD automake-1.8.5-r5.ebuild 2217 BLAKE2B 5e41a3306eeb6b6fd0088bde2c27ce38c3827ad2439f40115af4fe44b342d2aee2746dea3709fcef813bdabec32210bafd52c4c2d86070f28566bd73caae156d SHA512 00a9094495c8608f0fdac56cc4eb7b25275fc85e033b212503c884bf63aabf2bcfa937bdcf3f49653cd76886115790ffa16236e4cbdcb681d52f0e09e80d5b5e
-EBUILD automake-1.9.6-r5.ebuild 2568 BLAKE2B 5ad29ec0e787930e9803794c53911884c18b7c5f000246b67cc47ee933f5e74db83555d00958c0fa89219405422e304b4a64193efd74df052f6534fe18fd23f8 SHA512 a000accedafa2e8044506dfa26d9501f4fe8e00ad89d6125301bfca78e7477a794a3d643e45c017d7c8d936971a755596511dc362df37931c0b5f4786a708e0b
-EBUILD automake-9999.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
+EBUILD automake-1.10.3-r3.ebuild 2352 BLAKE2B e2cc5c875531fb50c95670a2ce104bc4eefbd591736855d7dce99fd7585a72b631c0c2987e17a8ee3b13e96d7a675db96536617acb5ab9e3b19333afe0919ed7 SHA512 682af6cae70d98fb1b55f5440fd6c7931910b3371495f4c6bca2500dd7c4db5d8e4051cdd2ed0a6cc80c51f5e8412c6c95572bc69a57e77e9c361d78b4f1e1ef
+EBUILD automake-1.11.6-r3.ebuild 2583 BLAKE2B 1d602abc057c673494a0839968171b787ee62e173221cca18c1fc02e6098db31c73cf1b495930c84e9d90444f59de7e4460a91580fd67e664ade9fc8d766e37f SHA512 215d0de950c36815a6a48df60a52dbd8c287f4590e9e5474208ee1373dd5643cd276a625f05413f4ed4152bc62d1a737bd1b0af3c3870dcca2ea7d50750e2a52
+EBUILD automake-1.12.6-r2.ebuild 2365 BLAKE2B b4362c6f035ef6c202fd103caf030e3aefffad89b3cb61bf465409c144b8c96eb90fd1936cba700bfadaa4d4def359cc715bbba3cd95cd1316dad68ccbe01878 SHA512 83574c2665f60aa10203384e143e6f1dbe1f2b652b68bbb83090038c3f0ec3fb3c6875cf1deb7ebc36684deebb9a1c6272509caa58efba5f6316d8fdbb268888
+EBUILD automake-1.13.4-r2.ebuild 2618 BLAKE2B 7ae9591a424fd8fd1a42a90ded518a4797b4dd985db6d300b5e5d94afab39d1629aa698857016ab6ad13cee8c6c32c10c24b1fe6843462332ea6a3ed6e1967d7 SHA512 88d3bec431acc07f155766b172f34b01686371e667bcef9fca10a7c6c04386d2224ae0b65e6486b140169c5ea410d2f2e823adb61efee3842d9f381663a21f68
+EBUILD automake-1.14.1-r2.ebuild 3037 BLAKE2B 70e266ee7ecd681c4edd79315709943dded46173f805a5d191b8d7f27b51802640d1b9c03141f60eafaacf2c70554eb8ef48175b7793a836daa938cc6d8ea347 SHA512 a0802e791982b209a6a43c93b6e8d6587fb784ef49dac7ccb37d7d21aa5631290bbb9a9857a18b0e0b9a9fa809f15be3a0065a2493ce293d066426e5ee572eb0
+EBUILD automake-1.15.1-r2.ebuild 3207 BLAKE2B 8e08ea5d008afd4cd739958281b8ba69a48ff30145764c7bf5b9f32ec452dab58851cf55fd823b8d8908928b45969bd77367ad3743816a71dba84386f8ee6cce SHA512 cdba7bb6fe81df606501adfc2d1dc93a71c836e3cb987827271d3f3fa3c67a31f2f042a2483f564f9a07dd06f69ce97e1638d1e3b88e3b004aadd1d6336578f5
+EBUILD automake-1.16.1-r1.ebuild 3132 BLAKE2B f35ab077eda4d19fe8c67a88c3ac9f568bc6831622f5f1efb6cdfa8d3caf2b54c7fd79dddd28caa94991a61f71222a7142c657643bab0583b52b7128460c0b89 SHA512 d3e909a622e88f072ec0fc977b0406e02a7f0d800e96a5fe715e4c24ff0f087af42c789ec0ece9832c9e61cbcf815f710e1615935cf9c8b46a8abf0afaf7984a
+EBUILD automake-1.16.1-r2.ebuild 3630 BLAKE2B 4623977d5598404a613dfee378feb53b97ae5c724c6fccbb5a236ab4861c2755e05f0777155d3182ffadf6b777f90a88dac881c7a2bb356b7c1ad1f30f304153 SHA512 fa5f121283bee781449981d985b571fa244503e17713e679cb2c3845631d472e614c5f6c98c91230288bd9ffed16bc88ac98b8c84f2414618ffc174f5b0547b2
+EBUILD automake-1.16.2.ebuild 3416 BLAKE2B a57d755ad8e43746d96878c154d03360c633e29c149056e990b6f10b70a0baa21a26e990e245d56458b5b1f64e53fbce6ff9c1b7f8d829dc2815239b0557b3b1 SHA512 58c0cb4967fa32ea0f5878e0521dbf5514c4c72423bc379f2190d70067235d716f6b648b925d61025d9b5823ffeab4a86c0834f9a07ecaeae46ca603bc83db4f
+EBUILD automake-1.4_p6-r2.ebuild 2467 BLAKE2B 4850464d153c77a710019fc9aa6ba76c1389de0687cab54746293aff3acd4566e183297a599f4c335cb3fd746e957abece17522dfec08740a51599e868ee43ca SHA512 7195487ce2b9731c3ceaf980bd50f44d6da112343ab97d80eed2982100e8c8a5e6aa5d919aee7cb9e9da861124e8cafbeec2651269d8c7f434b832f8e9a28854
+EBUILD automake-1.5-r2.ebuild 2285 BLAKE2B 34312bc744e5a432a5ef2f6a14013419209dea1562d00b506c701977d1e1df1307920604cd1c1ab2a907435e212b9afea3cb67dbe41d7084800b1d5719467fbf SHA512 0b66fa0ff1ec7769e171ff418ca014e64695227385c700e8966994394ba4f2957b6a72c96b75ddb080692976a69f2cb604e4725c5b9b7d486a92a4803e9eee93
+EBUILD automake-1.6.3-r2.ebuild 2033 BLAKE2B a2056ace246c5fcac914e102bd1bd7a65e412e991d305432bd63dd76bdf0d2a81f6edaecf1603bc358b73268de417634a9c7e6c72ff2ee0e69a09fd9f18cec40 SHA512 912d0e585bc5f393f36b134b76d64282b51011f31a14c655d5b49d29969ad8067649c4b262261dc66515c74f9a6ca890740c86710b4980b90e75cf0190525429
+EBUILD automake-1.7.9-r3.ebuild 2188 BLAKE2B 8f4b5befc50cb4bfc2dbaa5c7cdd7833d51a155fcedaa73196fc6fd949c0f4de0354d7f85ac16bcd42a70556878c959a490cc7b88d1c499e8f8904fceab1fc96 SHA512 eea2e6d881ff280e6fdfb47c832493ae592b10fddef9dd1931627d048494aba6d14160631667f5ee684f0d52ef01907c7642c509e65ea42de1c830424189f661
+EBUILD automake-1.8.5-r5.ebuild 2215 BLAKE2B 2d0e4895160e57b05c2e252f21040268dc63e3fe0c51f4b8e9712a5d60318c6322c393dd6b3805eb28081cf473c9aaa8e313d63fe199badf0dac2bfecd537396 SHA512 ecceb2c53e2f8ebafe91987e0be6239734717284326942fb8eb00d16d6bfb053cabe4a603c0b42df0ed039f47513e101b3bf9086d1cec4e3847b0eaae8387057
+EBUILD automake-1.9.6-r5.ebuild 2566 BLAKE2B 3bdb8cb4ceb4048e337db9821589ff5493c65dd8b200102f26886f99d40e897f88581877917924b5b49aa4f781f59ac44f1b3c8bb0bdc46edbe0f0cca9026413 SHA512 d1a9ca50370da827d65d5f13ecbb2e27fc2fece4bb5d5ecd3d227baf168ecf977e5a1dde39f47072ea9f42363f72d26b55c0f3dadfced62a1f866a328beade0c
+EBUILD automake-9999.ebuild 3416 BLAKE2B a57d755ad8e43746d96878c154d03360c633e29c149056e990b6f10b70a0baa21a26e990e245d56458b5b1f64e53fbce6ff9c1b7f8d829dc2815239b0557b3b1 SHA512 58c0cb4967fa32ea0f5878e0521dbf5514c4c72423bc379f2190d70067235d716f6b648b925d61025d9b5823ffeab4a86c0834f9a07ecaeae46ca603bc83db4f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index bdd8de5ea1d0..60306262c638 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 34609c5553f1..d1e9781cd4e0 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 4dffe576f56b..0dbf5c801875 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 7f0cdd6e98f4..7f231b5159c1 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 9ec6d8877115..b6471b2bdaea 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index fcd8d2e092d4..ac7c1fb24e50 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
index 681f16a302b1..eb17df9e7f8c 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 47c426b024ca..e66657f4e190 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.2.ebuild b/sys-devel/automake/automake-1.16.2.ebuild
new file mode 100644
index 000000000000..fc05add3e373
--- /dev/null
+++ b/sys-devel/automake/automake-1.16.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	if [[ ${PV/_beta} == ${PV} ]]; then
+		MY_P="${P}"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	else
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
+		MY_P="${PN}-${MY_PV}"
+
+		# Alpha/beta releases are not distributed on the usual mirrors.
+		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	fi
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-11
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/gzip
+	sys-apps/help2man
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/automake-1.16.2-py3-compile.patch
+)
+# All patches have been submitted upstream.
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# Bug 628912
+	if ! has_version sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+# slot the info pages.  do this w/out munging the source so we don't have
+# to depend on texinfo to regen things.  #464146 (among others)
+slot_info_pages() {
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	slot_info_pages
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+}
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index af9ad342bda9..3ad21cf8709a 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index d429eaa2bc40..79e56eb6d6ad 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index a76e625d0ec0..716e2cee066b 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index cd38a07287ec..416d433efe25 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index f1310fa4ad98..f33db87db32f 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index d56283717d43..902f658798dc 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 47c426b024ca..fc05add3e373 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
@@ -47,11 +47,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/automake-1.16.1-py3-compile.patch
-	"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
-	"${FILESDIR}"/automake-1.16.1-py3-pep3147.patch
-	"${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch
-	"${FILESDIR}"/automake-1.16.1-py3-compile-test.patch
+	"${FILESDIR}"/automake-1.16.2-py3-compile.patch
 )
 # All patches have been submitted upstream.
 
diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
new file mode 100644
index 000000000000..7924f204ad4f
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
@@ -0,0 +1,73 @@
+From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2019 11:51:19 +0100
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index e56d98d6e..5b9ae5d5d 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -126,12 +126,10 @@ if test "$python_major" -le 2; then
+   import_lib=imp
+   import_test="hasattr(imp, 'get_tag')"
+   import_call=imp.cache_from_source
+-  import_arg2=', False' # needed in one call and not the other
+ else
+   import_lib=importlib
+   import_test="hasattr(sys.implementation, 'cache_tag')"
+   import_call=importlib.util.cache_from_source
+-  import_arg2=
+ fi
+ 
+ $PYTHON -c "
+@@ -159,7 +157,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, $import_lib
+ 
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+     sys.exit(0)
+ 
+ files = '''$files'''
+@@ -173,7 +171,30 @@ for file in files.split():
+     sys.stdout.write(file)
+     sys.stdout.flush()
+     if $import_test:
+-        py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
++        py_compile.compile(filepath, $import_call(filepath), path)
++    else:
++        py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, $import_lib
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++    sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
++for file in files.split():
++    $pathtrans
++    $filetrans
++    if not os.path.exists(filepath) or not (len(filepath) >= 3
++                                            and filepath[-3:] == '.py'):
++	    continue
++    sys.stdout.write(file)
++    sys.stdout.flush()
++    if $import_test:
++        py_compile.compile(filepath, $import_call(filepath), path)
+     else:
+         py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+-- 
+2.25.2
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index f2cc10d4a78f..ef5708982178 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -4,6 +4,6 @@ AUX bc-1.07.1-no-ed-its-sed.patch 441 BLAKE2B 52a6b47ea4d4847ca53e731a1ddc5ba4d5
 AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
-EBUILD bc-1.06.95-r2.ebuild 1589 BLAKE2B cd7ec2338fd091272e803fd2eaaaa8bfe1dcca257ccf81a211aab66ff77a1cedd2ee75d9901acbca2e0b145c7edf29a884392a8f50282ecc0a69a254374226ff SHA512 79c12be9aa018a7f039ac91180fbfe489c88050b6a784d9ada2d3c86e6e9732bffbdcfe50d65dcaaab599c3c52abae0d42260f5cbaa76b09444c77b703cd3518
-EBUILD bc-1.07.1-r3.ebuild 1462 BLAKE2B 8b3868f319e2291ec7d57e0b76c0e8c6bf05f37bf95f8c500f9c338ffd51e034ee21e88ae942c02be7924a847c3a3036b658cccfc429c454f41b6fdcde344b62 SHA512 b4237f24d1528f7f8d1ec1f848ac86eb720e1ebaad90ddbd220706f35e21591ed037a6122b522d34092aa0fda78a2281d17da0d3dc148ec8c9946ec856b4b591
+EBUILD bc-1.06.95-r2.ebuild 1587 BLAKE2B 657ace3760faac2dfc3f51d35930d4e9c2e1773347de307fa6d3198ee7b2f6be168030c174a483f5838daa2d2413758f606d333e1575b95de727f24c1571a52c SHA512 5e222297f732e10cccaa04839f03f2a088f401479f7b23ba640cdac613b372a9317c8430f9dbdc5e1fe61d6a8505e44def1f29161e97d17e3b825247486a650b
+EBUILD bc-1.07.1-r3.ebuild 1458 BLAKE2B 1c81a73fcf4c2ff2ddbd879221ec6a6a2133e1c6cd0278191aca81434b39d404d9ae3eee92a3eab3fa324c5e900b6d411ac793b10497a70448d09c71089018b6 SHA512 2ff4b50c50d9e15d2ff4ffbfba69da27ea49833d677957b3aafc3f535fa274a0dc5cbdb76d7be6dc3c4750be68d220fb729aec6a98d734d4b2b2c110733a0dc6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 984899c25d53..3a73cf49eb0d 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r3.ebuild b/sys-devel/bc/bc-1.07.1-r3.ebuild
index 33e7244ef027..7dbe77693f66 100644
--- a/sys-devel/bc/bc-1.07.1-r3.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 50e3dd635ef6..6bf68b6298bd 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,7 +3,6 @@ AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d
 AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1088 BLAKE2B b719611d2f52024c32338593b217ba58293f3de0d8ab8dd986e22a38cbb3e8e7c8266756e6a0e5ca6fa45b3eca0ebf5f20efee203f304b283cefadc42df67223 SHA512 31a38db5c9afeeaaa228f26b8881734cf696ab4c79ec207d16cd6d9ce45697da53f3dcb826b70c7999b301e362b1a7308bf9164c0adb252ca858c68abeaa9f5b
-EBUILD binutils-config-5.1-r1.ebuild 1093 BLAKE2B 28652f565c8f965d0d25e799a00d61a8db7b920e888307e1ed70219842c3055ab3e29f8bbb1d855ba4323766b7e0556417d85deb3fb8fd7a73fb6853227b4d54 SHA512 739ed7fc0aef158a2e0eb5c0ba8ab2e0a53df92dda121c0ab4fc4a38308e7b837482c158faa7f060568e3ceee00a7933feecd6a4f181e6a873ba7c42506ef1a6
-EBUILD binutils-config-5.2.ebuild 1096 BLAKE2B 55c1b3bac2602025fbb78de16095ef210cac15d33c9cfae061ace625f3525d556d5e315366558eb989d2509ee735ca8fd9f5b09a1de09ff42e686c93d01e74dd SHA512 0f1f18371ee118baeada46f2ef13b78f212fa15a947321b0d9b1007a317547265f30908c56c8a975166f6a9dbd82cc672afc85e0c0efd1c4ce8226fcbb29c4a2
+EBUILD binutils-config-5.1-r1.ebuild 1091 BLAKE2B 72fea36252e65ba46c07fe779e107fc0ccc5e87f142ec8ac666f928c79f9509da5ec2ac668d31fc5cfc37ec66de375c5a1a89f845ee7fd0e85eb13a6554f66e9 SHA512 fb9e97f2ebbbd3446c15ac934b2bf321cec7f1ecadeb5bf9f98116ba6e019dd4fd0e222d043871643341871e6c9bc123b968f926f50e84ef86af50d4625509c2
+EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/binutils-config-5-r4.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
deleted file mode 100644
index 0e40b27ac6a5..000000000000
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit prefix
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/binutils.eselect
-}
-
-pkg_preinst() {
-	# Force a refresh when upgrading from an older version that symlinked
-	# in all the libs & includes that binutils-libs handles. #528088
-	if has_version "<${CATEGORY}/${PN}-5" ; then
-		local bc current
-		bc="${ED}/usr/bin/binutils-config"
-		if current=$("${bc}" -c) ; then
-			"${bc}" "${current}"
-		fi
-	fi
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index d124f18c027d..ae14aaa4c5c3 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
index f06a03d13692..855d88b035e3 100644
--- a/sys-devel/binutils-config/binutils-config-5.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index b16314493cc5..770a40b48060 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -1,16 +1,10 @@
-DIST binutils-2.30-patches-5.tar.xz 590864 BLAKE2B 71de4d08f92ab1898ad576a21763f955067cbbed543250888e0c5d51f4ef77d0d829049e9a835691cf2de03965fbcc9bcfa092eb304c03f9b885e7a3dadab286 SHA512 029b3be6ae9b8620f8580a35701bd4517b4e0232ff3cf9983b3808475c7443cbf500b6cace2c052df0bd1e47202838f4d2453238db28709a947117071d9ae804
-DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b19294c0be09ebdff2fc4533dd16116fcd4f4a1b4c8db02233dabe33ca68347e0a30e542456988a4ead407edb47ed031e018c SHA512 c84ff9cd9f5b1e313e93d0f25bb4244950a73e0d97ec4dacb8763382219a08a01b16a8e93173032232ea4239098b29448331ed461f792e663e1117eb0811f85b
-DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-EBUILD binutils-hppa64-2.30-r4.ebuild 10898 BLAKE2B 072becd133a6610448b6ed7c94c4cf6057956b30c3800921924410222a391769bc54c1ebdcaac3df33e41f67bfceed425b5bd5b7a04858250fd6204ae7a71900 SHA512 c9a217f476d7319561bc8082385e2b087360e57dff0591c365a046936c4fe716e54dc430aaae37d0613c4c919efcb90d55d74ee8485084592d67902ea3674fe9
-EBUILD binutils-hppa64-2.31.1-r6.ebuild 12568 BLAKE2B 8d7b2eb44bd013122f3c8bddf08f7b288fcf5fb510eb66d4e0e5b4933deb857fc49b064448082434dafa0bff9431c26021db95608bc36686fc239ddd316bddf7 SHA512 866cfc06bc700c72a8f4c4ddccb2a78265efc9d4bce062ba6469b01436b0b944fd8ef332496296ae129e07a1c6c3b828f553ac18dab03b5e8b4ed85267fe221d
 EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
-EBUILD binutils-hppa64-2.33.1.ebuild 12303 BLAKE2B f11a9eb2c0ff5d918435d570b540808143cc23fccd9f1785f65e97f9b87688beb2995c970f49dcead3c98a901dd65aeea4f75724f161ba269bd9ac61d9ae0436 SHA512 1406cbdd1680983659f2c4f7973f9fef08b62b1ce7e9a67891af4c4e1510baf5cb42bd5945896aa54f62d324b8bac42ee6a513fc4ac9293815d71bd0785e07ac
-EBUILD binutils-hppa64-2.34.ebuild 12422 BLAKE2B 3a206f1d69ae29ec654c95f316c9d488be97510cd9433338498fe13b0e67951440d014a40befeaba6c250cbed5fdc9c8e22bf0024c5343b6d65a261befadd11f SHA512 9eb4e2fed2968bec04ad3c6af14c7a6017bbfdb0c95db306fbfe177a19b12baf694fd10ff047f3cdc3f559c21146302b10c8ba7fc950e4e73ead10f2a302aed4
+EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
+EBUILD binutils-hppa64-2.34.ebuild 12433 BLAKE2B 239db2882c3f484fccca1b90a0db543bf9529c7af0f3c0bffb9b8a2a055d923af9769d3ac2b00ffaa3df9f2bd9da2f177382bbd038aad8a1a10dfa4df907baf0 SHA512 f4fbf04c0b84b27053890f31ef61ceff6a326d5049dc5a1cb6a5ac84fe1eb9562df628dc5ab93a3733bba94fde4f81eb23f0bf9918d216eaff149b1326f53407
 MISC metadata.xml 766 BLAKE2B e03336034fccf22a9cd0559a1a78bcc99f7cec05b7e526798e739a48589d50732d1664c6d9fcffe6defcd18840e612cba1a158e557785423d4834c2c54183579 SHA512 ea6c1bc005fecf24c4673f623b6d21ded664e5999720c6b74ad2a3654c40a274c9003a2a44dd402de3317a1d3d4450bc1d3c74683b3a98557363d62e21043e04
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild
deleted file mode 100644
index 86763d13f440..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="+cxx doc multitarget +nls static-libs test"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=5
-
-case ${PV} in
-	9999)
-		BVER="git"
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		;;
-	*)
-		BVER=${PV}
-		SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz"
-		;;
-esac
-SLOT="${BVER}"
-KEYWORDS="-* hppa"
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		9999)
-			git-r3_src_unpack;
-			;;
-		*)
-			default
-			;;
-	esac
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${BVER}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
-	fi
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use cxx ; then
-		myconf+=( --enable-gold )
-		myconf+=( --enable-plugins )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	emake all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${BVER} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${BVER}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${BVER}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${BVER} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${BVER}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
-		binutils-config ${CTARGET}-${BVER}
-	fi
-}
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild
deleted file mode 100644
index a06de11aeeda..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild
+++ /dev/null
@@ -1,445 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-# USE="+cxx" is a transitional flag until llvm migrates to new flags:
-#    bug #677888
-IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: slyfox
-
-PATCH_VER=7
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-esac
-SLOT=$(get_version_component_range 1-2)
-KEYWORDS="-* hppa"
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
index 087fa9a6ac02..ecd3f2f999b8 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
@@ -44,7 +44,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="-* ~hppa"
+		KEYWORDS="-* hppa"
 		;;
 esac
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34.ebuild
index 97770ec57d63..526abae15dbf 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.34.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.34.ebuild
@@ -75,7 +75,8 @@ RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( sys-apps/texinfo )
 	test? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 5f7d683f43fd..4b887d26c8cd 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,25 +1,18 @@
 AUX binutils-2.29.1-nogoldtest.patch 730 BLAKE2B f4f5926511866e58566abc224d2bae1336eb2cbfb63ae6d2a8a3b1f455f24d31fe0ecaee616eb6075712b8d90c40495a639c413c7229c9dfa741a5d284ff2911 SHA512 dd94d947fd25a770990ebc711fba6f680c90677e726f7cdc5435dd121f57e28e3a19343805e514045513bb011094f3a1fe2c4178d1be73e5d38a24abcc2b88e5
+AUX binutils-2.32-gcc-10.patch 321 BLAKE2B a16a525ac14a2ebc5ec8a463370c6917a57835bd8c04599cb880193fc7c3a4569084e9eb206505357f9d73575fe380964fc404171dae7bb1ee53c157bad3e221 SHA512 dc3ef3da32ac58bb0678f49ba3e6c613653113d93dfc3af4541e1808ad92268c62003cae22e0059a8d5d8ba9e27282bca8d59ecca928d7a9f593454d795e54de
 AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e24934f57ff53d42694c3fe6f1afd6fb091b70ca114ff539ae6274699f0e3584decbf1355d1d1cd720bb4aca31bcb33 SHA512 8c0cd37738d2d172aadf1df875d028538d9edca35b681d7faa7dc3ab64e2c214d9c33862795a51c0cba9a61aaea9c5bbf5f9f9fb4a01762aa266f32c97eaafbd
 AUX binutils-configure-LANG.patch 2082 BLAKE2B 5db7ce0626dee8f3d84547eaccc5a2808bbb55657dd22c890782446fc9fe3e84683277d8da675067d9fd494d99dd292883174e133e440ce6a90d22a9f1aa9142 SHA512 1caf25d5e332d7de313b6be73e753fdde7b02235af564a9c06517f5874127998eeed731388617b75f54be6fec21835b78a54ce6c7162a33e25411fe3c78efee7
-DIST binutils-2.30-patches-5.tar.xz 590864 BLAKE2B 71de4d08f92ab1898ad576a21763f955067cbbed543250888e0c5d51f4ef77d0d829049e9a835691cf2de03965fbcc9bcfa092eb304c03f9b885e7a3dadab286 SHA512 029b3be6ae9b8620f8580a35701bd4517b4e0232ff3cf9983b3808475c7443cbf500b6cace2c052df0bd1e47202838f4d2453238db28709a947117071d9ae804
-DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b19294c0be09ebdff2fc4533dd16116fcd4f4a1b4c8db02233dabe33ca68347e0a30e542456988a4ead407edb47ed031e018c SHA512 c84ff9cd9f5b1e313e93d0f25bb4244950a73e0d97ec4dacb8763382219a08a01b16a8e93173032232ea4239098b29448331ed461f792e663e1117eb0811f85b
-DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
-DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-9999-patches-5.tar.xz 17492 BLAKE2B 4d5072d26d714dbc2a65899102c35791887b3c1298eb40a72088f5f964f500fa82581ac27a47f075812610e1757ba1ca5ac7d055dccc0d819ec06a86ca98f395 SHA512 c8a843cf04b72f010eef405cc2d029e49fb1f4582686f1e0409579d544b02d249c31f7cb9cd59747bc94727e29ddaba89951043b392017c6963ca14f3a0202b1
-EBUILD binutils-2.30-r4.ebuild 12040 BLAKE2B e65dc765e696198a351bae755ac57dd241a48f1275e8859279b6e34fa276fddf93b01f9174ac7bcbaa437901293efdee58ac2c31de139429d182ae7e2d124827 SHA512 2ed54acfb3cecf6794fe2ab5a2731e2950f444cf0a114460d5d91eaa82d849c6a02afacb9c3bdafbc0b9e4d89e58c835eeafa4f2d2b2443cd0dd69d29ccee701
-EBUILD binutils-2.31.1-r6.ebuild 12434 BLAKE2B c6dd8c1a9d6560f3b68d3cf1002b87cc83a6e28c3822f1ad0a04784bac51d280da8eab093b25e4f07929794a0601a3f7c3c695480bd79f02de1829f6b3bb89a5 SHA512 e479a230558078d427cbd7d4d9e2f41cfc5fe14b7628fb16130de00c8dd32314675c55557d8f07b038184e90511695ad0e77d159d4b4b8b95424138208181e23
-EBUILD binutils-2.32-r1.ebuild 12639 BLAKE2B 3266dd1afdae254fa2d50ff363605f4a198c2828e474cd3d2b27698b948085ecc3b770e08da0e4ae51870933bf921da923021072672896fc02290834682aff55 SHA512 d2d0c51fa30d29f138330797b18890535184f16bdff9af90fe27d8728f07b1b90ae5ada9e8191c6d6e7c21fa3cbadc63daf6fdb818345d992e1b0b661099f50e
-EBUILD binutils-2.32-r2.ebuild 12339 BLAKE2B 978931e2c94136651b3004d6ba16b8b548188e445d60985cb2dbc7a03014d8b7047fb0a2ce2815e18da99b3969ddd1aba93d92a52dee955aa9c825850e314c59 SHA512 40f4ff36083643963e0408ae03ef525e40a30ad6a1e80492383eea04b25e4953f3c1a663940114acf225e80e8dea2b41197021e2fb621901d281971f20394891
-EBUILD binutils-2.33.1-r1.ebuild 12165 BLAKE2B 3b74881670f8a17b4494569f09a8fcb1c131356c59fb709e991c5c5d596c155d9836adbee6431cdb44f12c897526469def4d35cf3691d8c28e6f4ba846a86ffd SHA512 c426743b4df71d65f9a16ae9c1c01c64392d3c80ec8cdd6d27dff405da089002c2379d3179bdf1d296ec1b9c4e93ab96c30e112f39cea79c794b6f2f30ae8844
-EBUILD binutils-2.33.1.ebuild 12116 BLAKE2B f551f6525106c4424109c33321ebe19875c62f33242f911b81d1b1b910c439a85eedcfacebec21ffe294ff69e49f7d3b17d419aa50f8a906e1792f6a7877a941 SHA512 7e2cf157053ad3983f796e6d338d468d37c9663acf1bb9e1a09dc0a011289e761fae048656332f67dd4288b36b35a32cb3c387a4749b67a6179b0315d3989759
-EBUILD binutils-2.34.ebuild 12287 BLAKE2B 0ef9519979f5ddd27508b146d3183492884634e07587cda3a793251a7ce443d4e24f3c41eb31d8a2d1c429ce46725124d2cae7f90bf3109c92697ce80ad734f4 SHA512 b289b189ef88ef80456db5950f8d069d976d0dc3214d9a9d7fce0e8acde7697fc1da4dec72940b4153272837ed317732bb4ab054debae715badff8aae5875fc9
-EBUILD binutils-9999.ebuild 12137 BLAKE2B 86f91f4c346f69ab27b090c344ace15129a18f3359db6fd17ddb62ece6082dd7af45ec9c3e628882b922d6ebdf43f7a7b2a1f09a358fbd384ac217a4c3c475d3 SHA512 3e1ed8c1eacafe6ea23903651cf6ea7e8fa96bd0010d843be0870a0901e2ea7ef3bcb870d953b3b605e5829f498b1569b20787e918ccd7d648fe0ddfec3f97fd
+EBUILD binutils-2.32-r1.ebuild 12637 BLAKE2B 85afec0feaa345068164685142af4f5897b19e9a13a24efefac96782576b219ddc4b991c7b55df48ae63bbf40382e981a1d00ad980333cf10a37c90f2167a74f SHA512 fa81c3683cff355a0d040a19742dbf12d41017cd37c25023fea15fe360b1f527ce54eb32d9edf20af9a5f87ef4b924160526c82d65ae5021587d5d54221b31d4
+EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459
+EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9
+EBUILD binutils-2.34.ebuild 12294 BLAKE2B 438ffb5a86f533d3fb70ecf8977eb8ddcce58e21a1754436d02d2ccc664211d6b1f9021949285b670b97dc5bf38798438b1f2c07cb47cbf49539edeacda94f5d SHA512 a6be053d98cdd20d0bf3633a38c16ccd3cd46c434f6d2f7cd7334540822bf61a27959b3795e98fcf959faafea54429a921b4ea346b90aebb0eb83cffdef78a00
+EBUILD binutils-9999.ebuild 12148 BLAKE2B 0efe47e54fd54debf514adf269d8151ad7e6932854055becc0ba242da61c2cb17a1f3aa11e7d1edfafc1086e3a4d2a4f6bf69d37a753357f6d3d57cefecee96e SHA512 62b1b9540fbd666eec6c935e24cfc79ce293b89db75690dc7667aa99bceae51e82ff6c495a58a9a4d6283158297877523d798a9f0a802264c669d0308670b076
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
deleted file mode 100644
index bbbf3b1bd433..000000000000
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="+cxx doc multitarget +nls static-libs test"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=5
-
-case ${PV} in
-	9999)
-		BVER="git"
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		;;
-	*)
-		BVER=${PV}
-		SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz"
-		;;
-esac
-SLOT="${BVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		9999)
-			git-r3_src_unpack;
-			;;
-		*)
-			default
-			;;
-	esac
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${BVER}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${BVER}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use cxx ; then
-		myconf+=( --enable-gold )
-		myconf+=( --enable-plugins )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${BVER} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${BVER}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${BVER}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${BVER}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
-		binutils-config ${CTARGET}-${BVER}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
deleted file mode 100644
index e8bacea37184..000000000000
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-# USE="+cxx" is a transitional flag until llvm migrates to new flags:
-#    bug #677888
-IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=7
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-# Disable gold testsuite since it always fails.
-PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index a97a41e78456..9f09edd7b4e0 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
index 3e54336e168a..ef860c0fe8c3 100644
--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -42,7 +42,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 		;;
 esac
 
@@ -55,8 +55,13 @@ PATCH_DEV=${PATCH_DEV:-slyfox}
 [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 
-# Disable gold testsuite since it always fails.
-PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
+PATCHES=(
+	# Disable gold testsuite since it always fails.
+	"${FILESDIR}/${PN}-2.29.1-nogoldtest.patch"
+
+	"${FILESDIR}"/${PN}-2.32-gcc-10.patch
+	"${FILESDIR}"/${PN}-2.33-gcc-10.patch
+)
 
 #
 # The cross-compile logic
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
index f43e2da21fcb..c0f31907a70b 100644
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -42,7 +42,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.33.1.ebuild b/sys-devel/binutils/binutils-2.33.1.ebuild
deleted file mode 100644
index 164192f9c5cd..000000000000
--- a/sys-devel/binutils/binutils-2.33.1.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(ver_cut 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(ver_cut 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.34.ebuild b/sys-devel/binutils/binutils-2.34.ebuild
index b85960a8eee9..805c709df2ad 100644
--- a/sys-devel/binutils/binutils-2.34.ebuild
+++ b/sys-devel/binutils/binutils-2.34.ebuild
@@ -42,7 +42,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 		;;
 esac
 
@@ -73,7 +73,8 @@ RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( sys-apps/texinfo )
 	test? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index a735c2f7e2e8..7e5b921ee5f7 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -74,7 +74,8 @@ RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( sys-apps/texinfo )
 	test? ( dev-util/dejagnu )
 	nls? ( sys-devel/gettext )
diff --git a/sys-devel/binutils/files/binutils-2.32-gcc-10.patch b/sys-devel/binutils/files/binutils-2.32-gcc-10.patch
new file mode 100644
index 000000000000..fa7069456cdf
--- /dev/null
+++ b/sys-devel/binutils/files/binutils-2.32-gcc-10.patch
@@ -0,0 +1,16 @@
+commit a3972330f49f81b3bea64af0970d22f42ae56ec3
+Author: Martin Liska <mliska@suse.cz>
+Date:   Fri Jun 7 07:36:52 2019 +0200
+
+    Fix a missing include of <string>
+    
+--- a/gold/errors.h
++++ b/gold/errors.h
+@@ -24,6 +24,7 @@
+ #define GOLD_ERRORS_H
+ 
+ #include <cstdarg>
++#include <string>
+ 
+ #include "gold-threads.h"
+ 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 872423fdbeba..37e1e856017d 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -5,11 +5,11 @@ DIST bison-3.3.2.tar.xz 2108612 BLAKE2B 84cf59c02ff4ba34c052ef2539cde8d5932145ab
 DIST bison-3.4.2-patches-01.tar.xz 11152 BLAKE2B a0d0423e034cfa1dc45a542c05667a8226b535e82c260f638b67f4cf0f693b55b531bf310ed2e701ed7cc8b30f4b9ba9de61dcfcc64428fed38c9d528976b4bd SHA512 14341c52bf53d9fa58da0818626312b199ad1c14b2e0180589d6713d79caa6206070826e0ea65901cee0f6bf3122a7a9f8dad75a6c7d31cb11a31136e7d5a325
 DIST bison-3.4.2.tar.xz 2240532 BLAKE2B fb3d90dc3f21075069684e5d9f8d6982353d909b8c62c4d9925a22319c9f486a4ad7e2629a8932449a3444580ed701357c326aa7cd778a68f66f8eeae70cdac1 SHA512 00d2b37187b93100ec4b220ce2752d12ccf68f9d0d39b380d375d36dd8a22aa1d6e60156918f95e4493f9531c5d42d8fad38fd807307b491c1ca7ca4177823d9
 DIST bison-3.5.1-patches-01.tar.xz 9388 BLAKE2B 656cdc4fef308df3bc97c8f452ae75440909ed7eae13a8bdfc6b3b380f9d392ac3c9d300cb1e7a6d5548271b6ac63f5dfef594cbf9ef5322f97024468ed8e757 SHA512 195725726575998ff3d274d723ce3f605f9e1478601904668f165c1d9f628ed94380dfa65e546f12e3fc80b41aae7899774208510f382864dffde8545710f211
-DIST bison-3.5.1.tar.xz 2354592 BLAKE2B 29e85c8f38f122b90ca38d4def3c9305a562dc29755865fc091f809191c0af435fe8fb5b424da8b69f143f30d8b6439876f735bf45dd8cf9f45e291e93789078 SHA512 f5a075608c563652181e6804cdd280761a05b88f41f4b287d49bbe4c18b08724b057ff95c07dfa3fddb5c95de8b229db76821e9d197d4bec206102f62cb390d8
-DIST bison-3.5.2.tar.xz 2362956 BLAKE2B f2c487cff816c010e82e95c23c26323eb4e11c7293a1358359564068b84438edded20586b4729e1432a7718f9ba6a9856298d66c17e45a10d28216272be6eea8 SHA512 f8d213fa58f04ce8e55437ecfa378869a85c07234223dc89dbe7533b7f663a105eddaebd0902fb46b258048400c09d4b8181f033932b74aa41bca13ea5c120aa
-EBUILD bison-3.1.ebuild 2483 BLAKE2B bd66b37441731ffcac9eae279270e2d33e04b7ca4c5251f75336ecdb381786ab9f82f32d37f33e8e28b429277838f4b3db31bf2077effeebd83b918ea0025034 SHA512 94cd328a59bf6ca5f680860a9e5b7fdbbebec3cb170c57350b51a12d6f95fcc0faeb3a2ce89a5747446079925b4d7d2a14f511d82dcb12aa89d30d01ae799967
-EBUILD bison-3.3.2.ebuild 2608 BLAKE2B 7d67ee3d8a77609aaf5da0895559a721290cea1b006d545fe92530c8d20dc93771a70ec89f720d322f494a3080ae9b5422dd243c1561f073ac43f9d571f685bf SHA512 fbb5411ecebc4aafc74f8feb257a1e37de081430b4a5c1db340f4279cc1423fc455bf4c86e3def830d9fff8938765c56fd541464cd1131efd94b7156d785b5d3
-EBUILD bison-3.4.2.ebuild 2479 BLAKE2B 4711645e5ed1817b804fe8146097da597db86d36884312ac36b11bb4a63f103054f1959fbc5dffca812dba5cf187f7d9e76d6d72c0b9ee039fd119d04ddf204a SHA512 b91a200e0c971b5c13b7f767d5aa5f70516b29a2c69d37eff7979778799cff4e8222275d65405de1b490e9c6983a9df14675a6c99f0c3c4c61c292a6da44197d
-EBUILD bison-3.5.1.ebuild 2491 BLAKE2B 0a2718ca1a707a6476bbad85d28b146ee4c8fe8822a8aac363ad4fcd49539c6b16966cd6cf0e3a194714f2e457c4b30619175bec18787d3d22db498cd0ecf5eb SHA512 87f4cf975cb4c72a4893330232fe544081934f45adc088c0a0c0d8d416737f455370b538b354ed40d19f67bd0f0c91449a8b56c3fc85c2e014ba663365194d4e
-EBUILD bison-3.5.2.ebuild 2491 BLAKE2B 0a2718ca1a707a6476bbad85d28b146ee4c8fe8822a8aac363ad4fcd49539c6b16966cd6cf0e3a194714f2e457c4b30619175bec18787d3d22db498cd0ecf5eb SHA512 87f4cf975cb4c72a4893330232fe544081934f45adc088c0a0c0d8d416737f455370b538b354ed40d19f67bd0f0c91449a8b56c3fc85c2e014ba663365194d4e
+DIST bison-3.5.3.tar.xz 2364904 BLAKE2B def6d9927746691ec06fa78637fe3bace015bd10e3d51389890489d864169f888aa7c7ea5400b8190766a0ab4b45f0edc1cb07dfd572b693e969e43a1b47d73e SHA512 888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308
+DIST bison-3.5.4.tar.xz 2370252 BLAKE2B 38078224f2e8e99210b64948831942f91062c6c9a080bee627f1ab4542f01b15bf2d4ce33a9864ae37cd5fb9bcc21e7e3382f98086698be12e01916640dd11f9 SHA512 92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331
+EBUILD bison-3.1.ebuild 2481 BLAKE2B 44b0c9e57e462115384c184fba710b461d8f71afa0c3717287f967f507f4e58e5074ed8799ea3ecf62e25389052070800fcfcbfe458a9aaa492f01839350bafb SHA512 beb709aa160a525b377d8081079084d8a919dc0bc88fa51b847e42a550fd819c1f7f0bc46af22216aef6873a0d72fb447aed584f804901f6b9a21955ad039501
+EBUILD bison-3.3.2.ebuild 2604 BLAKE2B 4a634ef94acb4ec6189aa83967232f3b6a29f8408000a733920a8125da22ab2180950cd44eb06c7948cb87080e1fc9ca0ab864666d3ee519056b5820f12fa1c5 SHA512 95b30075d74b742c71cc8efbe9e2c096bc73827bbedc996e5429a9d26e6bd35c2ed6388f60e8f831588014e75868d3165078bab29e18a7970907e8e8a96357dd
+EBUILD bison-3.4.2.ebuild 2475 BLAKE2B 08355d3475296df4df66d7d8ed336d7bd85e3f856afdb43802afd929784c31b945250ace89f9f33f95238348a54502b3c62bea91cf75eb4becb0dc78fefb3273 SHA512 3a743140947e99949c2fb599ad2ebabc69bb3f773bc70961b0345c3009261b84a8f2bcc7a9612830b80e432957db4e50acbedd2d25c4af4d5436da58a8f97a4c
+EBUILD bison-3.5.3.ebuild 2487 BLAKE2B 4f9475c770b3ea48b98724599a5abd0846f907c5e37b5b315e4d19a74fb0b17981c1e2911f277132fc9d73e412a630c50b3b5802a3a6eaf39e8f0cf3c0aa1e8e SHA512 7e1e957a90d5244d13559f26c14f23b60b8cc9c23793a84c75cd78af77d28dae338932f9b87b7a3bbd9d3df141d43d1c770bf5611812d8ec1a08449471683285
+EBUILD bison-3.5.4.ebuild 2487 BLAKE2B 4f9475c770b3ea48b98724599a5abd0846f907c5e37b5b315e4d19a74fb0b17981c1e2911f277132fc9d73e412a630c50b3b5802a3a6eaf39e8f0cf3c0aa1e8e SHA512 7e1e957a90d5244d13559f26c14f23b60b8cc9c23793a84c75cd78af77d28dae338932f9b87b7a3bbd9d3df141d43d1c770bf5611812d8ec1a08449471683285
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
index 862b16ed7c7b..1bd09ba23495 100644
--- a/sys-devel/bison/bison-3.1.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.3.2.ebuild b/sys-devel/bison/bison-3.3.2.ebuild
index 1c864d8b237a..a936a5c81dea 100644
--- a/sys-devel/bison/bison-3.3.2.ebuild
+++ b/sys-devel/bison/bison-3.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.4.2.ebuild b/sys-devel/bison/bison-3.4.2.ebuild
index 55c19a6514d8..8d0a6041d055 100644
--- a/sys-devel/bison/bison-3.4.2.ebuild
+++ b/sys-devel/bison/bison-3.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.5.1.ebuild b/sys-devel/bison/bison-3.5.3.ebuild
index 6c9a25cfeca2..f2977ccb4e95 100644
--- a/sys-devel/bison/bison-3.5.1.ebuild
+++ b/sys-devel/bison/bison-3.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.5.2.ebuild b/sys-devel/bison/bison-3.5.4.ebuild
index 6c9a25cfeca2..f2977ccb4e95 100644
--- a/sys-devel/bison/bison-3.5.2.ebuild
+++ b/sys-devel/bison/bison-3.5.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index 14f5ee871008..d8d2a1157ea6 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -1,3 +1,3 @@
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
-EBUILD boost-m4-0.4_p20160328.ebuild 906 BLAKE2B c8d0a0b0d7581fc7b4e60bc8da1dd70fd31bfcaa0d97cd9acfeef28d7c6da63bb13938b501ba3e56cf82b70108fcf64556dbe45504bf7bb221842deef568041f SHA512 30db607863687c0b0fa0e551dfb27d3d6c48d4891bed38e838ac6feacc0853579c358c571b730fb23d871dab35f4e0f2ea09c3d52b6d88a66e53dd2215212271
+EBUILD boost-m4-0.4_p20160328.ebuild 907 BLAKE2B 132ecdf469ee32a1b11d7b771817f4b426c502a2dfa7556e1de9c9519bf14942cf9d596e40f6b440ee9d98252af1df99d5338d3520618527038359bca781a3e0 SHA512 87042561c24a9061cf221426d73d74ddb9232b7d8e1f0215755340abfbe3dce685205096ec5375dd828d2e1452c73e2406c6a6dbd917912625c6d986b87c4488
 MISC metadata.xml 249 BLAKE2B 4488d5817d75e16c337e26e571768949d36a1bd2ff42322d5f4bb62a4794f44b035dacbe27d62044c4dd205bba2bdb6a909bb82201bd2731259d8ce34da6abb6 SHA512 e720a57bb332e357f42ba922528039e087fc0f7896b110f7142bc7fd2c2e1a807dde3a6f9d9d47d322332f186b77cf01445be4df62d3ad508d697a3bf736d581
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index cf0e4ebfbc2c..ac463fac3727 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 0096cca6fa3f..f9cb952d59eb 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,13 +1,11 @@
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.0.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
-EBUILD clang-common-10.0.0_rc1.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
-EBUILD clang-common-10.0.0_rc2.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
+EBUILD clang-common-10.0.0.ebuild 589 BLAKE2B 71f0090e6d67508ab556dc2260ae6f0d0aa05fedec01815b67db31884d41756c0224d5df19ad7c242a0ab24b23dfde9ba8bad5d9bf95ce5434848663bcd0b0a2 SHA512 ac2a3296c395e38f1c5ba5cbccd230a0e625995756b8a8eb6b74911f87e31d1afd069b452f51a890e74147a7a79307469185f00cce21522d0b6b60045f686e24
 EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-7.1.0.ebuild 766 BLAKE2B a0b5b93670719d86b7edbaaa26586ba2b605a0a9054dd1bef53e566d205f84a9fae06fddc895eb7de4774924f89bdd619e974d9c3877a97b056464ddd534c5cb SHA512 7e7e4aff9bedc62d9bb59cdfa81d404ac0caac9d0b48811195a608db030a4eeda5f98c556a111d115b638c85b52bd27b450ce5a8ec047b220fad3d7213459257
 EBUILD clang-common-8.0.1.ebuild 798 BLAKE2B ee3a460e6e80ac0700fec452f3cf47a1f6054c7b93139e0fd4c5efec8ccf84d1cfe933420cca84e017e115bf45474db42f58813b98dc2f396feb61c00f2901d5 SHA512 feda961724c5bfde42926b0928107fae7df056e63041705a68eb7521ffc1e9f5be8f86591db41d10f97b940ef1ac664dc35ad11e59b29635b46b2fe5ea8c974b
-EBUILD clang-common-9.0.1.ebuild 585 BLAKE2B 8368a27812ca08ff53aaff177cb6927dadcad97a145e0d4a0c07787656e767be475a398d0f813715458d95ed49499fb373260f657a9369c3911febbbde535832 SHA512 ff8cd3e1348f1bad50a75d93ae3f9da96f65e8dd1520c02c042c64bb687cb517e5e44cf0a4677151a6fb1339ed3e8b023449462ea995f95897883d4ebe19fee7
+EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-10.0.0_rc1.ebuild b/sys-devel/clang-common/clang-common-10.0.0.ebuild
index 18e41e0917da..6b079c42a2cc 100644
--- a/sys-devel/clang-common/clang-common-10.0.0_rc1.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-10.0.0_rc2.ebuild b/sys-devel/clang-common/clang-common-10.0.0_rc2.ebuild
deleted file mode 100644
index 18e41e0917da..000000000000
--- a/sys-devel/clang-common/clang-common-10.0.0_rc2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-9.0.1.ebuild b/sys-devel/clang-common/clang-common-9.0.1.ebuild
index 90a24996694e..636965492422 100644
--- a/sys-devel/clang-common/clang-common-9.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 5be4c779880e..90bd6ed38c1d 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,8 +1,7 @@
 EBUILD clang-runtime-10.0.0.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
-EBUILD clang-runtime-10.0.0_rc1.ebuild 625 BLAKE2B 8db7bfa75ca928562b60b1bcc5f64ab85b3bd4c81f48f78488edbf80507bfa99c411ad32e5893d8f620d020bd2f21c996ad1c744e6881851d20fd5b504ee2010 SHA512 0a979a27e36ce410909e42e03ca2eb6f204059b24f654123646c17950e0a1db23b1cdd6668aef94f0623e74cf780a8b2fddb4dc1f58f1858498454650363414b
-EBUILD clang-runtime-10.0.0_rc2.ebuild 625 BLAKE2B 8db7bfa75ca928562b60b1bcc5f64ab85b3bd4c81f48f78488edbf80507bfa99c411ad32e5893d8f620d020bd2f21c996ad1c744e6881851d20fd5b504ee2010 SHA512 0a979a27e36ce410909e42e03ca2eb6f204059b24f654123646c17950e0a1db23b1cdd6668aef94f0623e74cf780a8b2fddb4dc1f58f1858498454650363414b
+EBUILD clang-runtime-10.0.0.ebuild 701 BLAKE2B 310160c35f36aab47af12dbfd1d4fd110050738a693d73276029c4e7b7c97d772294c25580808b3a267554207fb20b242ae48ffc13176b38813c108c8f6ea73f SHA512 f98ced68b29310f99744a4b8f3e024553e6db03b8c1efbb4f83997cf079e91b86d82d5742e1b3851765961d91f4940f439fdbea55061e72952eb113175cc1f57
 EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-7.1.0.ebuild 808 BLAKE2B 0063d26d15d1d2e068b0eca1189ec3e676618eabd4f22a8ede570d57b11ea4c4f8c8d25abc22ea4845832bb1d0a50bbb60a1080589c373675bbac9f6326b86e0 SHA512 234be48d982ae1b334680e051c969ef4233708b9dbb97727c93d973f0a35662db9437f30ae11c891423b7e00ba7a1ee1ad090d4ae69408aaf893e2bba33b2dc1
 EBUILD clang-runtime-8.0.1.ebuild 807 BLAKE2B 4d30a481ae14d01c2e5603e3fe4eb677ac3d3ba587660f206f0b45077e7d1ec4a9be544631374791d2fac78be6d07eb01283590afcd13a587460ecd68d95693b SHA512 fae9b0337505bcd52585564a80aab48ffc7ffdddfa22cc41c7f728df0b14c098bf36e51f1676fa33d247034e0b0d7dd8a23195bbd373ad311dbb83fafa7b55ae
-EBUILD clang-runtime-9.0.1.ebuild 697 BLAKE2B 2cb49aaeba44906fedb565cf4f9a7a50ca3e78e9b39bfc2f2c1e4925d1752ec3cca117a2ede94b319e8a9be7c853accf04bd79d32287b20c61b5b5273a4cc311 SHA512 4da76f3563d0f27b9f48bbcc7ea936acd6d9df0ffb672d2c4476e47b68e156dc60a0821e7bbf1fbd5be52d161f945a0edb116b849e20e6666042fc3c1d179b01
+EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
index 65e66879ab98..b2858aa38746 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0_rc2.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0_rc1.ebuild
deleted file mode 100644
index 65e66879ab98..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
index 6a8a6c57a881..04d3897324e8 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 571edbb96598..c3f2e16a8f69 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -4,19 +4,18 @@ DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
 DIST clang-tools-extra-8.0.1.src.tar.xz 1994068 BLAKE2B 7d312c1a958d9c5b24515067cbb1db3a92b34cdf77c2345c08ef2f327d2ae4ca7f05252d72ede6569e25cda34225963a8d415cc64279e39d542449ba56eae9c9 SHA512 d39962c30ee9d8a1679d8007009b48dea2c8aaeb283bed781a9e22a1a57b8186c2cfe058da046658882ace1c84a30ddf9b4cb75bce988891189e8423b6c6a72c
+DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7
 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.0.9999.ebuild 10946 BLAKE2B 6ca912316b58835777e3eeab18a4b288d7d6d41048f8f11992c800a9471520932b949c064fe873c9a5d53d32114b08a74507854dda96aa21afb0d6f169afc080 SHA512 bf8998b44b6277151c29104ec8a48ae2fa2bbb7ab3eb849e8d374aa8bd4d5fb64abd3b8a1eaffeb4015bf3c026f3aaee4d26e33255a8e3958fe77d1ad3c6d086
-EBUILD clang-10.0.0_rc1.ebuild 10944 BLAKE2B d0170a2c38baab0f5a5bf554a416919a33c330ceaa1c6af687cbc3b80874cf99cbb40e92f23892f66565d0adaa3a64a63a1883f67b665fb65d6c367a3643d9e0 SHA512 58267d1dded32c55bebca0a870bf6769af0fc659cdfb5a47f1f8574b0c89a4e454befaaa7d33513c7d591fa2a3b84418fc54977d3d648a01b741a3cdb8fa5f3e
-EBUILD clang-10.0.0_rc2.ebuild 10943 BLAKE2B 2aa1a022b6e68a2159ffc2562b706ec30d5babbcc83b0cb5e19d3ce4d588b62d69ccc883e534199314465d95ecf0e3bee84f8d34d72470510c6de880b0df67eb SHA512 9cba637f3876dfe8f2c9c80a9bf26ea6367edc4e44ed0f33a72fbed88297f8aaec22c26633ad154944d69b897e20356e18e36756520a21fb8e96ef0ca848932e
+EBUILD clang-10.0.0.ebuild 10200 BLAKE2B 29fd627fc09b01e5dc36eaac8787565b1497660358312364f583a9c6d90691774278623c729e6acf1db9899430f2a6df3ee0dc740486fc83f4afb7488e5ea399 SHA512 4e922a7209df6785cccc61d352324a4a090f8605e644b3747f2186ac4d640993137b20d275e082a56f74ac0e32339fb1100bd93d9b86666deeb16ef987fc139c
 EBUILD clang-11.0.0.9999.ebuild 10946 BLAKE2B 6ca912316b58835777e3eeab18a4b288d7d6d41048f8f11992c800a9471520932b949c064fe873c9a5d53d32114b08a74507854dda96aa21afb0d6f169afc080 SHA512 bf8998b44b6277151c29104ec8a48ae2fa2bbb7ab3eb849e8d374aa8bd4d5fb64abd3b8a1eaffeb4015bf3c026f3aaee4d26e33255a8e3958fe77d1ad3c6d086
 EBUILD clang-7.1.0.ebuild 10240 BLAKE2B 08dd7cdbd92c674a50e4d84f52fd25bd2c01ca562b819c659ca1973675803478cc7d3e6a8bd5dcff1caac19a02d8ebb4d149685b843b16b4cc1e5f2be1ddf9ef SHA512 1e3ea5ac965f96240faba9e7d01b3745ecb40b124a857fdb27727cda4af8317087bf593f98ced940632149d8fd13e1c9e970b2307abb6b132fe87896f1d004d3
 EBUILD clang-8.0.1.ebuild 10138 BLAKE2B a2c91918e468c3f070ba10d7a0478e006c5d23289db387d6ca57ee082a7567ef24ad7af66a3b93e0e8934c69fbcd5a4fefbfbd77ba0ef077776b4110b30a6773 SHA512 da86670ee496b2a1bfe3f99eb7146cd8a85d793f580ae2ebd94bfb65363c6e39c58fb77b3b00c27e5d9bdc70ecb1688154e500506525b019da3f95d356f815e1
-EBUILD clang-9.0.1.ebuild 8987 BLAKE2B 33154f9ba06325df93e59f573e829b00ff49ccfd55f9c7520b63b50775b54eb2ee13ce62744840f1ba63f7196e3171cd9146dcb65828b89ab34baa4c48cf748f SHA512 04e27cb57cb02eca753c4cf2d252e6d9d8a65e317bbc30f35aeafff4cea80391befcb52fe166e87d6560d3974f30613d9214dc3ba72803b9c0469ff93e867ec9
+EBUILD clang-9.0.1.ebuild 8986 BLAKE2B f5856c674005420ba9bc00b36320c4f02ee0963f4175ab0c6f3ff0711b0000b010d1dcfa16721343c5c3470d43317589f313bd3a6360b262170404ad952a0a17 SHA512 253038ce187c301417e3322fc7bb7ff4a04e210d5400d10b77add9a28e924a3f958ad1ec09c5dbab58a0f62286e9203e881affc885b1f9d8e5e30cb2b176cc60
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0_rc2.ebuild b/sys-devel/clang/clang-10.0.0.ebuild
index ee94d3e3bbe4..fb7b2c0d4fd4 100644
--- a/sys-devel/clang/clang-10.0.0_rc2.ebuild
+++ b/sys-devel/clang/clang-10.0.0.ebuild
@@ -7,8 +7,11 @@ PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
+MANPAGE_P=llvm-10.0.0-manpages
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
+SRC_URI="
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${MANPAGE_P}.tar.bz2 )"
 LLVM_COMPONENTS=( clang clang-tools-extra )
 LLVM_TEST_COMPONENTS=(
 	llvm/lib/Testing/Support
@@ -31,7 +34,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -82,58 +85,11 @@ src_unpack() {
 	cd x/y || die
 	llvm.org_src_unpack
 	mv clang-tools-extra clang/tools/extra || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
 
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
+	if ! use doc; then
+		ebegin "Unpacking ${MANPAGE_P}.tar.bz2"
+		tar -xf "${DISTDIR}/${MANPAGE_P}.tar.bz2" || die
+		eend ${?}
 	fi
 }
 
@@ -281,8 +237,6 @@ multilib_src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
-
-	multilib_is_native_abi && check_distribution_components
 }
 
 multilib_src_compile() {
@@ -371,6 +325,12 @@ multilib_src_install_all() {
 		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
 	fi
 
+	# install pre-generated manpages
+	if ! use doc; then
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/x/y/${MANPAGE_P}/clang"/*.1
+	fi
+
 	docompress "/usr/lib/llvm/${SLOT}/share/man"
 	# match 'html' non-compression
 	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
diff --git a/sys-devel/clang/clang-10.0.0_rc1.ebuild b/sys-devel/clang/clang-10.0.0_rc1.ebuild
deleted file mode 100644
index 03de91fd9e9d..000000000000
--- a/sys-devel/clang/clang-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-)
-llvm.org_set_globals
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/clang
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-	llvm.org_src_unpack
-	mv clang-tools-extra clang/tools/extra || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			c-index-test
-			clang
-			clang-format
-			clang-import-test
-			clang-offload-bundler
-			clang-offload-wrapper
-			clang-refactor
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-
-			# extra tools
-			clang-apply-replacements
-			clang-change-namespace
-			clang-doc
-			clang-include-fixer
-			clang-move
-			clang-query
-			clang-reorder-fields
-			clang-tidy
-			clangd
-			find-all-symbols
-			modularize
-			pp-trace
-		)
-
-		use doc && out+=(
-			docs-clang-html
-			docs-clang-man
-			docs-clang-tools-html
-			docs-clang-tools-man
-		)
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	multilib_is_native_abi &&
-		cmake-utils_src_make check-clang-tools check-clangd
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake-utils_src_make install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-9.0.1.ebuild b/sys-devel/clang/clang-9.0.1.ebuild
index 8a031b152600..9409933dac8b 100644
--- a/sys-devel/clang/clang-9.0.1.ebuild
+++ b/sys-devel/clang/clang-9.0.1.ebuild
@@ -32,7 +32,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 519c2fb94905..d7ac8046379a 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
-DIST crossdev-20191222.tar.xz 27320 BLAKE2B 375e0ccb7bfd5c5c365b9c874a7dbf75207843b68dbe6d4cf9da07b36efb7b3bb1e6c84f85268fea6c71d6afc1e284f9bd1dcfeca5536d0947f8d3a3f5344ca9 SHA512 ad32f2231663f312b2b35bdea81c9ddac584d13f9affd496f36cbed072a97e6f80deb3436dcbea184621a4bd86bb25d52fb0434208226a3d743f0f664cd91fd0
 DIST crossdev-20200125.tar.xz 27380 BLAKE2B 4871b3ba1130c8d2e4df263aea155f95352417e65dabe64968cf9cc2628f9a1ae32a7e569cdea73a04d32d05396b0a83720bbd712a5f5b703606692e6b61516b SHA512 a4db1d09179b23f032af59c4857c3ab58d7944633b0c612a1f8aa0ecc38201f960cc1da761f34288568bb7f3434fe4da5094b4d4445be047da8838a096f6c606
-EBUILD crossdev-20191222.ebuild 842 BLAKE2B 2d09ce6436e67ed545d6c04d2c84b0d331e07046874c737ce5e1fbedac3b4a546e38a60c48f243cb9203a13a6057439659c60138fa087b4418fbc2944a281231 SHA512 f90b200ac7bd9d6528584101af3913544d6184e47be725c77db55fbd9617b49b1764f7a9a551dee6200a4ba2ec2bbfe0ca60fa3342684f413168c43c72504a9a
-EBUILD crossdev-20200125.ebuild 854 BLAKE2B 08bb7e5ad2dcaa49e31589463f6c554e86cde96f93359a9f4c640414f3167a36c6bac8b0fbf69f06993049f0850064363bbcca1136d288f5b42fa855e74008d6 SHA512 4e8daa0cff8392f375bea77368b93467334d021d78f83ff67f4d9268430bd50bb2e5a70ea5d34c738b8f64aa77eb34c7935833bbcf1a8b3a96678e4098882925
-EBUILD crossdev-99999999.ebuild 860 BLAKE2B c5b9a0fe2b7ac3bf31bfeabe620ef2d657378c6e6147dd70152a6d081809e5ad5e23ed29497b507fe6aa6647d46e77780609119b480f9ee3e4ef157184785ca4 SHA512 b805b5c73290d90d3a820847319cdc30be0032ee2e52a85e1526b07f22971c2e9031797780ca940fa0ae19485c466e1d8e3a124754f7184e9498bc6769c7ed01
+DIST crossdev-20200131.tar.xz 28200 BLAKE2B b1b8e283d150968339e259c48b3f066f5233af2578b04e060d5e69c002af6ffd65214c559353a8ebcf3238c2b60d0ddfa29131e26c707647717088df55f77282 SHA512 e1d18a7d69cdc0240d30e77b1634bd6b5806e1576227e4ffa394805aa217c050ced75436e9a004a35bc9bc47b96ea2f3d8e19ef530a106736f7cc0d995bee4a5
+EBUILD crossdev-20200125.ebuild 840 BLAKE2B 52bca86c8adc00da38b161d2b9db785517f3170466d5a6fc2c85c8b0e69ad2a060ef5c334eb3fa8b9ff3b5aca3d8d5501a4c07b80c318eab1cda3d19a8267a99 SHA512 9d174c674ada108f64f5914bfa8e303a880a9df566ecabcd23416f828465fbfdcd63014b7f160a7da78df0afc1fc5180b01059d1b4b19cd7bd47d7b741754a6a
+EBUILD crossdev-20200131.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
+EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20200125.ebuild b/sys-devel/crossdev/crossdev-20200125.ebuild
index e37579ff62fd..eb83f565a615 100644
--- a/sys-devel/crossdev/crossdev-20200125.ebuild
+++ b/sys-devel/crossdev/crossdev-20200125.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20191222.ebuild b/sys-devel/crossdev/crossdev-20200131.ebuild
index 8f6b8bd48667..809478863946 100644
--- a/sys-devel/crossdev/crossdev-20191222.ebuild
+++ b/sys-devel/crossdev/crossdev-20200131.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index b9ef8900b80c..c2897f179723 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index a7d88bb419b7..3ff1481f3bb2 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -3,5 +3,5 @@ AUX dev86-0.16.21-make.patch 2299 BLAKE2B 7bc53ca455c545fe72b71a0daae8de8fd54da6
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.21-r3.ebuild 1908 BLAKE2B c8439d7cd438747879c2ebd80f85eb89a19844d677c2e9bebfe37de4ab8facc6d56cdc9cb669da70dc7db4b17cf3edf27ecec367759ce88b1052721ae8135b2f SHA512 e085a146c930939cd42ad75079196994a91980f38dcd0d1b3a13575ae9a4e5519f0606e906fa4979a86eabdb6082436bf80676aa7744ec5b75371499cd7cc3c8
+EBUILD dev86-0.16.21-r3.ebuild 1908 BLAKE2B 95ba63f3295a16acc4ae4cd90d10c63f941ab774acd5bce99f4f550cf747978df367df44e7030188c2c18cf9b533b475c4fd0bead4a2aaaedb9c57f966b32f89 SHA512 4647df3ce634209adbd7d3451fa29b7b6ab16300a97acdc4b340e604ad9baeec9765e76b4e9eac9f197f6f686a0e967204c4dbc3525a7933d1f2c39815cf081c
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
index 35355a20312c..25c40753bdac 100644
--- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ src_prepare() {
 			makefile.in || die
 	fi
 
-	sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die
+	sed -i -e "s|-O2 -g|${CFLAGS}|" -e '/INEXE=/s:-s::' makefile.in || die
 	sed -i -e "s:/lib/:/$(get_libdir)/:" bcc/bcc.c || die
 	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
 	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index c66b3a67ab59..a59c483373b4 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -8,5 +8,5 @@ AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964d
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
-EBUILD distcc-3.3.3-r1.ebuild 5603 BLAKE2B 9fbc1d99af2dc7cc38764ea523dc6e7135ab70b7148528ff747a97f914b213f23d7997d3b2cceef651f394e0452776b5981704629d7751535fdca03fc7d33db9 SHA512 7499b9037cc7590e6742f68161b1a2bbd7e414ce0be3ccd46cd2059cdc66452878a10979b3d5381347ad1c4c77393f8025d1467567c0369b5d182938deaa3e9f
+EBUILD distcc-3.3.3-r1.ebuild 5604 BLAKE2B d12b6a070398a8cd3a4e9092b658b8c73b54433fce38e6519e0acbaf5d540226bfac16f7ddefb38763fa43f8e2b2a6e702ec4d7db7475e6ff8300fada2315224 SHA512 3efed456bd9834de8efd5ffd5b34c40f7de786f1e17ce903ff2e017298fba702a099ba76af5ff547ae458ec751d6c264f6115144a3bdef489622ee0bda663a63
 MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 826019c73427..fd9f3fafc19f 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic python-single-r1 systemd \
 	toolchain-funcs user xdg-utils prefix
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a68815098ac9..ac8864fa56ec 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -4,9 +4,9 @@ AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81
 DIST flex-2.6.1.tar.xz 835048 BLAKE2B 5b0b67774d1ba2d4b2ad8a8cba1f0b8fed9aecdae387e54e6cb8fd1c0c9ef78559bc1a6fe6b97f984f16b438d350de4dccda7e3427d71fead9073ab6616b0ecc SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 DIST flex-2.6.3.tar.gz 1405560 BLAKE2B 2aa9ca18f2ab124db9567e2d2ee512881a71755342bdcbd05ef536653396d1e4ed47dafc1227531bf9e9a610d9c5aa2d924bf864b18c5a618b2ccb61db7fef4e SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
-EBUILD flex-2.6.1.ebuild 1901 BLAKE2B bfb62f0a21ea75daadcddc6f230f8d82d3f6fc8940cad9072e3d07322eb93b5cac37a78feee0e015e8b865642806829b63cd3c4d2e81b1eacb65043b38078b89 SHA512 41a845c5c96ff31c471f504c6a73a8b4807d408ad1ababe956247bd06b256ae776e7f608e2758fb0da5245e5bc7bea12b7b5d2d1477f7e2a23d8b387654941ef
-EBUILD flex-2.6.3-r1.ebuild 2048 BLAKE2B e154656aa46b95e262e198730d6694d9140ee93bc6aacd56e21d7d35897488e429973540ec4a7bed4074dcd097057f31eedb57c0b7b54150ea7026d458871f2a SHA512 5e57c5cf192d540907bf1c0f09197ebe3c2aabdf1f1fc6e2d57d2ddf91e6b5295372d9c4133c4a9eac3cc88676b211603c33d6989e2af8d1c90f642ee7ee5bc0
-EBUILD flex-2.6.3.ebuild 1974 BLAKE2B c6346e446682e53fc1d3e8e01b89f2de1777004e79520c4ec23f65ebf78b0211bd8c054889c2dec939281602345e54537cc5d60f6d5aa776514e06749b552395 SHA512 940ab22cbb9f938f2a6104ee6db2f7246d718ff8164938d4275feb14202b665ca07e17f62059b840044f2dea786077252e8bfa069b8d4b38cbc2f80c69149cb9
-EBUILD flex-2.6.4-r1.ebuild 2053 BLAKE2B e523ccfb448f99c8f0a07376f284bcb6d5c2072437643af0a556593bc15f481e0a9f730025f4f331950f5148583a72f5101424fd7e52c56baa771d4a37a61148 SHA512 9d0031887365a0cd4c1c675894bf681c70b95e6d3e11dccfdec5c1eaadc11d70854b64aba58b2b3a33855f7e97d827f62662bdfb55194a57af02f2bc709f4d6f
-EBUILD flex-2.6.4.ebuild 2013 BLAKE2B 0aa3fb7b8af9d681f90093217e069dba8fc73f6a57b71b2b93c3c20fdf39d608bf5b9f9b87e60baa1ef421cd5995fafe6617ccba7888700204385a16c540b7c5 SHA512 c2cf362d701f712ba22242051aa3c4d7e098416bc5ff1e3241aac8414b2f32016a964455375876f33813998385e61be853eebb109b5c4d11837aae3e51ff10b7
+EBUILD flex-2.6.1.ebuild 1899 BLAKE2B 77aa7003cfd5be6dfd3349a8544ef5426bd3d5d276b7e75c9a1ec92fe7839759aedd46817b9aa86999c3b71f1df9e7943657552b1d55676660d351a9f4bad4a9 SHA512 b432599b33e11e6eaeb32bb31f746c747eedc127a42af65f8847f86cdc69995dfb866d685384c5a6988f13ba856cead8f3cdd8c6850defb1a02f34df1ac68d5b
+EBUILD flex-2.6.3-r1.ebuild 2044 BLAKE2B 8d1a67ad48a320dabc5980148196786ed3d121c2053b08f7c1f9b4cce0157f10b77abcabc58957ca7853bfed8fa42e0906851c6cb3afebebee33684621dfbf73 SHA512 ad58be31183ccd6c6d4e0dba8327b1c5af77a7451d52dc42d76924b0a912531e4e8b7fa0b4b64432c60b10c02b3d03b22b6466d76d4186a56de0cc7173816620
+EBUILD flex-2.6.3.ebuild 1970 BLAKE2B 7e5d68765f51b29649f7e9a8ff5aeaf6b097d31118e00a691a35d24985f13c12c0bed0240c7350407c7606cc8c551377f7d1de501788c1aedf2c869d65603b3c SHA512 0de5e511498063e8ce497f8722a25e0f6d0fbf582928b0d4d00af3a5f5eed305d8e8d1bdafaf27c7c2094d31efa1d97100372fd18795870426c1083d84dad566
+EBUILD flex-2.6.4-r1.ebuild 2051 BLAKE2B 391c472bf4157616297ae90b16b1e41d0d3b01064dc39ff2ec211eebf0555145473d8a78f4ca671fd84026dc770c23284e4abb03085226001964532995ed50cf SHA512 38374e9ac66b567495814b098aaddf8a60b326ce11f87c353945b7f3ee8c7aa42bb42729d2d20f5918cbb4897a54296e8d4c37156d887314412f3fa74a0f2596
+EBUILD flex-2.6.4.ebuild 2009 BLAKE2B 25e93054e0a10548053185a2b3af311bcb85cf4940670e8fb5d1ae18b4b87b4c61a45dc51ff03bc09a4679718f6e8af4ba78926704ff8a47f2e3bc723c004c00 SHA512 d7454b849e7e8ccf1da433137511fab7d0c279a89e5b246cd03e6b2fc97823a566f3bcdc8ca43228f493936f9c158d4f5d7adf7870d8a093d185a2a3de74598c
 MISC metadata.xml 382 BLAKE2B 646b83d59e7560578fda79014272359cc99b041469d05189e17a53359aa08182372b27a180b67580ade4e4df42e4deacbcebda555d727dea57e43ecd99f8a90f SHA512 074161b6d11f46cb704846d60cbc0fe44672a5feacd39107968516d292d12cfbf5975290f23d45abf9a74fdd4bbcf5aad77d48c924d3f57a71b3887b23ec2047
diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index d3b1aa4e85ed..b644c1057e26 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild
index be6acefa30bf..845ab4577661 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index f2a60b83bbeb..8cc2ec6deb07 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 1357a7c0cd26..4312dbfb61b7 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 8f61cd8ee372..51d7ff1d2936 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index dc6f3f8d16bc..aeea35905bb2 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,8 +1,6 @@
 DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
 DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
-DIST gcc-config-2.2.tar.xz 15956 BLAKE2B c83c1e2584c42d5e6317e044fc6681f5006d9158ecb8d7127383a773e0b51fc2388aab9462088c087a877d77f8ee0631eb00b48b4ef13125af2bbb3871ea2582 SHA512 501d870488ebbeab2e704cab046b6432379c0dcf430fa24737fc97d9a0aa635e25fd4f7c0b7983f349ffd4c378b1971e4c8c82dc524b4916415985a6e0e7480b
-EBUILD gcc-config-2.1.ebuild 1187 BLAKE2B 8ccb39fdd56470671bb17b6b89a987ce215c13a43d6ad21be8f0da52271b95caf696bba65621fe9e3f6bf6bb317cc26814aca33b869e19e16a0fd07271d5ecd7 SHA512 306335a3c80850da82ef7e430e20819d098adab8902ed7795843689c33f362a430ad404ab32b12538ef64e2c62f0346e7058fba5368d780d05994e8bd1481ab8
-EBUILD gcc-config-2.2.1.ebuild 1199 BLAKE2B 907baa9a57b1691667ef09b8721bf9d53e84849b58ffd5a4e512067cd36f253d25e795397b636596b7efe2e4f7eb83938be9f81f31dd4b078070c01babf0ba00 SHA512 05e5d6053e8fc02d879dd882fa23c0fde1e0e6b0488ff640a443842fcda20f0633548bb245f7246502c0391669a0fd8be055a6126b4e24800a727049410ed1ec
-EBUILD gcc-config-2.2.ebuild 1190 BLAKE2B eb4b74f282309607dbb1d53973ad68634481a2578203518db9c8cae5af35fd60ad356a7469881b4a77374cf1e1c2cbdd2a3b547aacf20f2f1939a29e0baba78b SHA512 2b5d7d2086cfc3710571fae4b124be34111293c45906c23a106a0c07328cf3f4dcb403c9754639daf51602235af701b7c34ca6caf6aaf1ba4105b5dc59c4ec35
-EBUILD gcc-config-9999.ebuild 1195 BLAKE2B b5ec2af87244bfe98a13861e0114c12c72bf0adfc656e53fc425d88adce6c32700079ef5e03d469a0eb87bd77add159b5d453eaa2a6866deea8152e1fc38f842 SHA512 26bae4dfa89fcaeca9d9600eda7350b7cfec9239b9529b5e1cbfeadb2aef9ca2049a1253c306dfa09c7509c6dac806459250bbe3dbfd0c53ab684a6f4448c95c
+EBUILD gcc-config-2.1.ebuild 1185 BLAKE2B e0becacb2c2063d67c61a934a13cbb55c32f9b66ecaeb61d6648961d448c8b59bf56ecec972135af3b3d662d2db259e4ee50dadad6208174da66038e35da7b16 SHA512 fccf111223e65ed8ad8af762fc6b8b75a3c6917cd238f3562a5e7617a33bc8ddbd80480804aeae92091357897e4e376afeda1008c91213f8d4dad71d83f47dad
+EBUILD gcc-config-2.2.1.ebuild 1186 BLAKE2B c12aab5a9529bda5ad1a8d71598f8614428e494607651d26b510ccb14a5f612a2f114c8d40f9fdee1f4d62397891dc619bc60d7f54f1e987d1ad54f6b956a4a1 SHA512 ceb3d6b270f1bc0607b112dbb09faa27bc0584f1a35abcd770a4f3c2ac673b3a22ee3f3eaf6ac1073af66bac9802197bd408bee6a60c1dacd35350d04010cb6b
+EBUILD gcc-config-9999.ebuild 1191 BLAKE2B 5968b7ce726f124fdb75d485f0e0ed55f86b1d46df261824a5f71b4ed3738d1fb0565af51b11bdaad1ce0f9dec4afdf22d8072b228e51bdf8b9200fe4a01b001 SHA512 f65a73ea91c35638620f16c68768275dacfc5a47dc98b92ce9ee5c1c6477ea4d329321b1a9b1c96eb16989d1b30eceba2c5ed72769e7876047cc1897a0422e64
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index 96b1f1393f83..62349abc564c 100644
--- a/sys-devel/gcc-config/gcc-config-2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
index 14719662eb89..defb04078d85 100644
--- a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.2.ebuild b/sys-devel/gcc-config/gcc-config-2.2.ebuild
deleted file mode 100644
index 813b0267e422..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)" \
-		install
-}
-
-pkg_postinst() {
-	# Scrub eselect-compiler remains
-	rm -f "${ROOT}"/etc/env.d/05compiler &
-
-	# We not longer use the /usr/include/g++-v3 hacks, as
-	# it is not needed ...
-	rm -f "${ROOT}"/usr/include/g++{,-v3} &
-
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	wait
-}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index f79e8cf5bc76..c27a2a1f2a82 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index cfa7f229690a..380f94e2e959 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -62,44 +62,50 @@ DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 26b7d08bad4b617ede2564f77ded67c
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
-DIST gcc-5.5.0-patches-1.0.tar.bz2 29527 BLAKE2B 3ee9565591e6c07d658ebecc36972a0a5835856bf8969da6997e02c4e79cef45a2dc565609f7bd02aa27c4c9db406b3502417da010e94e6d05d37f56af1ca71f SHA512 07f331c70da5e45be295e9559735f34479b4d6187da5354d5e23cb77760c372990030ce9c7408bcc9605e3c5e81c8acb10689b3aad57574378a20b0f22a4f3c3
-DIST gcc-5.5.0-piepatches-v0.6.5.tar.bz2 14327 BLAKE2B db24b2d321328307147b0dccabf9b66424302c4b8994c2981f09efe65af58692dc8fe69a65d262f60015ac15a2d1850c2b86964592b72c994737e61c1d8827ef SHA512 2e3ee95c8f2c36968fd6dfaf7bfcfd03d9d98e9a5ee827fbff06d8b28cf0375072165f7299baa9eceb8aee3af21dbd0099f9ba5162ccd52751af8f1c750de9e1
+DIST gcc-5.5.0-patches-2.tar.bz2 30315 BLAKE2B 165c2d796008b62712d8481538739b280334f2111383bea182b9eb6f82631dce6fa7ae3adfe127acc113f5d91b7931133c90182897bfdf3cde30dfc6405536ce SHA512 231319dccfb4a8d7d386db526511ab248e6fce867e138769bf40dbbd5563e8e519140c377eb381a009172d07c778afbeebf749c5e8faabdc1da50c45988bee97
+DIST gcc-5.5.0-piepatches-v1.tar.bz2 14367 BLAKE2B ce1d288ca4d563cb12e2795dbc9f9c674e451295c75fb4b15b9ba65d3efc8dacea725775cca8c67b581647235b692dd4083e8b158f87c7951bbf6303d8efed43 SHA512 6baf18a7ac6cdc1f93a1a8f87bbbdcc96c68d2b256e82ce04beabdd4ad82b2260e04dbff0850da703fb94bb1f9e13439d2922d7aaae3b12eaa92bc53a89a9398
 DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
-DIST gcc-6.5.0-patches-2.tar.bz2 9870 BLAKE2B c6f6b3c04605da77679474d7784d674b4f6df5d39e7c26fb79b513852acc317776cb9d299ed78bec47544e7c5f932ef8d423483bf55fc830f6c244e71a4740ff SHA512 2e6998204e21fd098cb7823ec2dfa6c448ce0e96d2d4f7a18fcb833d7ac70cb97d7ccf5600dd2b695f7488d65bd4a13633ad78542cde72eca29d23323dfa2301
+DIST gcc-6.5.0-patches-3.tar.bz2 10882 BLAKE2B d4eaf97c7d531bd02442b8eea2a8537436681d01a4fe225ab4fd31863c174ee76fa9443c083bb85d51743c7d3e6e6791cf94390cdcc80f5d05179f90074b0346 SHA512 e99586b142cce71aca0843543a195753a27872c9b49ca841c8b3525d8a010d8e6793dc4800d9acd89c7f63c57635e630a2db2f25b33f9690af4a1eff1aebd9eb
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.4.0-patches-1.2.tar.bz2 9380 BLAKE2B a9608c7993b875f1c8d81e2aa15c46e10f91e6f37a723d7c09dd29dff7bb169a58597afc483dd46ffb3ce24944f824d746aa49d1a59924036e04aa855ca875aa SHA512 7959126eee11c10d9c3bbc867f6a74273dbd6e8f2d896d65b3fe1de73f0d8e09fbb62c7ff02ba8d1798206251ad1059c4490cdefa8adff09212eb23403923642
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
-DIST gcc-7.5.0-patches-1.tar.bz2 9631 BLAKE2B f5f776cadb8c6ddd4f15d95f91765e0f05fc3b23894869a9a0fab30a5421869e0e3ca507ecbf96c11f6decc74222103ffec0eef93cc5089b0e8aaed07a045fe2 SHA512 9b3902ce686c586c1bcafde97675a88c50a6c6ea8ad800cb794390e72603d73023ef7b04a643fb852e745716d3d9c5f4932d407196f55b0bfbbee1d6fe75ea3d
+DIST gcc-7.5.0-patches-2.tar.bz2 10573 BLAKE2B 7f631174fe317d97d92cbad7dd18285eb1596333ff2dfad346fea0d76a00fbcbd78b4c296f863854772c9ed3ce23ca9fd41c23d02e172d4dbbf23bd1f803bb4f SHA512 1f53b320acd813e97bb37b3165f6f2e37259d551e0ee49df08056c0b17a7e4a02b3a764e56d97a37c4cb71302ab5fe55b82f0b96c1adf5fa8b71016cab4fc0b9
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
 DIST gcc-8.3.0-patches-3.tar.bz2 15944 BLAKE2B f1ae61be794123f34ca88c279bfe33abadd37eea0ca0267ac9c0c77707dc8305063a7ecc2e23511c281f7e903dff349fef016d3fbbf3237acf383fe1639d4b7b SHA512 f43d86a55c932df4a494c6b687101a2992b91b1a4e01677165ed0f04de6108150ef713762f71d0ef764dbd4bad97a99d15fcb42c23e4bb42d83a866ff2d0c614
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
+DIST gcc-8.4.0-patches-1.tar.bz2 14854 BLAKE2B 055ac27224a100c9678b343fe85e3431d4553780716ac2a9cdfa1e5bcd7b5073b883cefa460dbab8b34ffd8d19dadab0e66cebf9ee51a89a8a2d212268450248 SHA512 aaf44c0ccbd99690cea9cd4452bae8d4d6bff98ba591b29d50a50c19f3221c24e923441a24392f9717f541aa4e097645756fdf0ff558b7a263ef21d7d1e334eb
+DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
 DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
-DIST gcc-9.2.0-patches-5.tar.bz2 22929 BLAKE2B 2d8a69098d836d24ec295e2e0ff6864f34914473b1e4ae1630c3ee23c16aba8ee1a9c943c89a629d1c8a2d2018796ac4b01992fcd9d926c693423041572c8155 SHA512 79961204054b1eb91e87bb9f226ce236ffb8bacf1550b7a5abaf8c121fa373d9fa8fcd56f201887976f76056a22cf75a418b6221d0ea35050d3ec4465a764fc0
+DIST gcc-9.2.0-patches-6.tar.bz2 23171 BLAKE2B 00295f471a276764daf003c0eb6351d6d4e7e247df2519b4fc6bf360d72ba10af1230ca0175cbd96ab4beaf0123b5061c7c2f7f5c0b95b7f416a735ad9ff454d SHA512 8a8a070a66a24f31ec2d3d1cf170db2d030a1667485064646d360c3154330f01e7b44595642040c07d033922f1654c4b18bbabfe269210b3d1aeb24fe248b613
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c
+DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
-EBUILD gcc-10.0.1_pre9999.ebuild 1377 BLAKE2B 7fd61087963a7eb10c47854fa7a18b1fcbf145a80415b9c3b9d2179fe75ca63a63d59c20191abef5b81473ce38b725f3a06acbc8fb51833ef1d31ac226a86e35 SHA512 4c1394b19416d1c767dda36aa813c7240f3d0b9e7918bdc845144702fc59185d5e9299d9a07969dfe41699c02ec2ed2536735a7c540ae7ba508adae11425e608
+EBUILD gcc-10.0.1_pre9999.ebuild 1025 BLAKE2B 478a868e4b391371f82804068add5d984c715cf4f2288094f30793faf3eb395e57c858301da0472b8e4e2410e4d352fca4416d1ddb036b7e15a04de5e692ab44 SHA512 4c255b7e3842c378679766827c53592b520cb34a3a2dfadc59ef0ac32783dd56892ffd7368d4448b3a5cc677341e0ec4917c7cfab44aae68fd264764fc71677c
 EBUILD gcc-3.3.6-r5.ebuild 1242 BLAKE2B 9c316577e76d305f8eac6ba33ca97c26c207cade4da2f0d37c33be02fac6f9faa0eb487ddf9f68fb6db2cd128d6dabc3355eaef62c6775626af56eb96ba2f5b0 SHA512 3d11094be8ea52010d5128941db2dd23fae8e80460f2f03b03ee9111e5a32e3f6dfdf214d257de59de8cc02bdab9cdb563252a5b1a19ccb577d1e7ad8156cb81
-EBUILD gcc-3.4.6-r5.ebuild 1382 BLAKE2B f453aad0f67b641c7a40203b47c017dcf4d9e1259f835eeff392f3decb9b4e66596eada89e619021c351cc743e2c2bdc9a59527a3d9ffda56dcfff9b19789887 SHA512 4f14db02a0a345fd6f64af2a81801c091801d68721eb3c83390876f50d00718ec821a53320faf1bcb530045ab246c51802aa549b21b41918c885271fc62c0223
+EBUILD gcc-3.4.6-r5.ebuild 1378 BLAKE2B 9e100ed11696853bc94162de79e2f2faad9762e86058056c8698d0666211a89b02156eef14514b137dc935c4daafd707187f52fc42e69416d76d68e975ff1c47 SHA512 4d0fb19b03bf5203d1d5c297a7de367b9f5fc26001af2bfce81cb24ae8f696a05ddeea59db2206662a1274f05e64a224f385ffdbcf696b96ac068b9f6c3809f0
 EBUILD gcc-4.0.4-r3.ebuild 242 BLAKE2B 269e476876f1ee62e288c7a3ee14a2261698bd12be875cd6bde54cb6d048bbcff11a82fec5b46d740fc4c607deed8cc6e1452cfcd4e5fa32b8a11708b86fca20 SHA512 8bb91642a9f12b48ac79011885bf416afdc501f080459b02a32efd2577ead6d6076f2a6637024eeb2364889de1a45191c0b3e47e7038871287b073072b420015
-EBUILD gcc-4.1.2-r2.ebuild 643 BLAKE2B 982428e246fa55bb4a9aeb7fd4fb59a9f9ac083f2d18720268fb052055682ad47891158cf473483084f89be2310d57669e997ba0c59b438953511bba74c4d5a8 SHA512 1f360765493b17fdfc28e84ae81580fe3f2a4915d52b279c3093e214d2c0eaeb9b23a854dd93b80ff50b358fee9bf961ee21e19de4d0437a6c94ba7da19c5952
+EBUILD gcc-4.1.2-r2.ebuild 639 BLAKE2B d53b85c247c05141525b56f878a8637d90765699cf4e6917e1e43f81e1ef8ae1a712c75ce22a3adf897491bf83b993f6e58ad63db9c035236b5ca90868d605f0 SHA512 f83b2a2f22f0d332df4feaa852b6ea8d1187d9b172b4516676a50eddd1346a7a3d5c80471e1f6cb301abe5c3c8714c419b7decd5390129b90f2db46c3f736582
 EBUILD gcc-4.2.4-r4.ebuild 380 BLAKE2B 547b1c63e3f35852fd1731bd7c18b54aad03d3796fb6065f537029657fd96cca930aa3f59e3adff034b1b81e5f46348a771c04f116a5fa1eccf38323a9d51c78 SHA512 4d2fe882873b3083f966c7612486a47f349182cf726cd18dd973ee884d1dab14336c524734aece515957c632e63dcb6901a844aa8e0bdf0eb47f0973eaeb54ce
-EBUILD gcc-4.3.6-r4.ebuild 623 BLAKE2B 2b3a901399a250df0a8e1fe9035bcaabab5dfab6886439dcaf9192059ea0d6115007c148872841f69be411bd344004f4ac7e96ee79445ebad1080c8b18df9891 SHA512 3d238123072d7ba0222bfff9aefe4693e4a683f7ec593768b67578bd22c52fddaee67b8556dd7881477fce68b324c4b67749b2bfc0d6789e85c7922906da9255
-EBUILD gcc-4.4.7-r3.ebuild 668 BLAKE2B 0ac9a982a444a0a5cccb519e9523101a2b22968d35abdbd04beb8e6599dab19c7cd7dba7fa346e221e29985a87e8528c8834e245c62a5afe70ae319ddddc2cf4 SHA512 83199dea246e467f0da5dcaaa0ccfe45954b0688c484c90a0b9f96c60b6cb5d2f7d60d286248caaeebfb81aa5df6826c1d6b6d75fb82713d8cb3fa4d98790870
-EBUILD gcc-4.5.4-r3.ebuild 669 BLAKE2B 136c1ac3480b88d449985fbd0ecf383240985716a7d7efb18d387b9ab5c41f2143e5a0132d77175fa8ab319064a82df71aede929fc9da2cc389a186d2464ae7b SHA512 625a46dfbe66c46f39515c9b9d740a8e90a8cfeb1405b5a9afb7926f2b4821434789eb4937d0c76d986dcc70efe10d59ccd010b95fffdb9609253064564f9480
-EBUILD gcc-4.6.4-r3.ebuild 750 BLAKE2B 61a9acf56d1a04d88de3b65b6ce7bdf2d98eb5bf747d8f2cd388cb558dc64658f16a3bc5ac9baf757772423caf7b4dd251b35cac7fdd3eeb5a666d25dbc81c80 SHA512 a61bb4343af6dfd9401ef0f27cebd1bfb1334fc1a5888fabaae08bf9a15f8d97a72fd53e3a5d15706c37ebd920a827dc9f6e9472f58a58d637c2701ecdf6d1e0
-EBUILD gcc-4.7.4-r3.ebuild 1278 BLAKE2B 7bebadeeece4abbac0aadc45a86e3cd85ee2f3acbfaa943835dd051ee4d157356a9434800371936a78f33bf7082ba216b7e205737cf9110488c60683b02df690 SHA512 fcacc27b7406fa747e7be7bab432ab9aca59d51fd0ab23a1f922ff074f6c77293791473a5630731332e4bb225d3aab9ac12b860b538e56bc3eb4a7e9567ef61b
-EBUILD gcc-4.8.5-r3.ebuild 1389 BLAKE2B 37df6ef3df83f2e01b5bb925dd9c5a2325b8901ffb7345cf1ce76be696a1b8a6d84d8e70ca0a1aeba27ed850569d88c1cbe60fb697bcb81fdae9f2d8aa49a2f8 SHA512 e24737d4c52e501dd6b18d5f5a0b02077090394fd019d6828bb20a1466203d0bf84be071c20168fbe104c9ec975e27a1e9fb6902a0b1fb8b7507cfd06f8fcb51
-EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee3e2de2f19f105bf06afd8a1c6dea7b1b741b402c9c59f717be9c6f9311664b916a50241a009954ce5fcf621e SHA512 aa8de516f9b193eb83532761d7cc37611e70bc4e9bdc007e88935933db8ee10ef1eb1b464d79169754f98f8ae50586ac6e209dd91b7372b561fd35e39ba2d519
-EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
-EBUILD gcc-6.5.0-r1.ebuild 437 BLAKE2B 61e56ad07920dfae7597cf485b28e5241ff7259bbc2d962eca6ab474f0a2ba4777d6812131a5e419a0bbbd76f5056bf60954a6ff25af988b9c76a8bad7ef34db SHA512 1e7fad221da8704736f86c01126a3a85b48a60a849d3085461b9f7594769c3bac46820cdc566fa7f9c8a7e2876a088660f3907d403aed1fcbda3bed34738580c
-EBUILD gcc-7.4.0-r2.ebuild 450 BLAKE2B 1545360759baf09fa1121559dc4386132d16764ba109aed4ab23511f48cf8bdc46930d5f207f0285ebef0096159e89b9339a3029e7d86b03e7c77c981cb550eb SHA512 accb5689034eadc8af56db0a0a38ce1f0eb59bffc6851417af22a6a6abdb7eae3ec71a974b43910bbde8bb1e51d0c0956bf551501de19c8068d0880e7dc06f97
-EBUILD gcc-7.5.0.ebuild 460 BLAKE2B d1ee2bc661a09fe23dfdb82efcd4344fbf195e3752b54a594205e2f13bbedcce77d1196dbe2771265f5d5754b86fd53c7c253be0f92dc2816721fffed7b607f1 SHA512 1c0bd8cbfcafe1b4b02237932d86eb82ef6c3b3fb75212b5c67b207480a73c719f1371e5975a468440d7e3aa2307f043afe6c3651348f3d5ed01ddb29595c730
-EBUILD gcc-8.3.0-r1.ebuild 588 BLAKE2B 86ec11e0b0e0b14cd7ce80103af0209abe3bc0a0744ed4ecbf1a1ef09ba247221c7663da697a1aa32568c296e23d3b4840d1b09bdd8791710df49bd5e1d305b0 SHA512 f74a2a4dc5aaa7f20e15ea0251c79f79a50a5b7b5b41e0ea6c6b0f7feeb9e9a9ee2c6058ee7deafe1f1a97f64d79876d5cce90574802c709c7c774910d77783b
-EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
-EBUILD gcc-9.2.0-r2.ebuild 542 BLAKE2B bedd2e29aa28770536db465d5041ef570bcb779a5160ba217a2932c4be05920ad750f5c1dc03cf96642213491b857663e736aba4942774bc312acf895ab15a6e SHA512 33d6a497b16c8929ab458a0f306a20b97b616cdd6b33c60f7d16a68611b576ce34ef0dbecbba1d05938427866dbd55c9df4a21bffd6da91d942d4949e1697dd6
-EBUILD gcc-9.2.0-r3.ebuild 552 BLAKE2B be621aa9ecc90da68a35d08290f6aceba25af9814d4b223493d1ada5143c63ab94c50abc6b2a52129fae57960e471c4957f1a9c7c12e8ae01baec40162a14729 SHA512 e1e4ef5742bac97c17cccff0f2a5454cdea35f3acddf8bfcf99e761025e3e07627900897f13fc524d86072783d2466e392da81f87b9256727d3d3e3ae12e758d
-EBUILD gcc-9.2.0-r4.ebuild 456 BLAKE2B b1a8e7464b4ab32d28499251421b1d9c2afa74871eabdb28767de692d2d34650bfeafa0fb089a35ca246cff5c501f505ee81b7916dcbafd6bdd49d17bc1c51d9 SHA512 5acaa210414e2461cf0a562403a2864c6cfe2ec95507859dfb4da54b9f9379c46c50076e116b77e38512bed6557a8ae12da36a1d8c1e7be52d32b7e6cd433b0a
-MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
+EBUILD gcc-4.3.6-r4.ebuild 619 BLAKE2B b762535b06447d7c51b00dff019901c5134039f2708c980f47b67f1b35bebf98b4dedd19a5e68afdfb88eb6cb0163f6f8f620a6ac52029d8a391ad907bd7ab6b SHA512 75ddab4a3c9caa736e379edd46c70bb11924061535c6a07a6145c4f4a9d4d5a6f816862e2ec44c3c40d6065457c245cc53233111e7360b118274d5f397a59629
+EBUILD gcc-4.4.7-r3.ebuild 664 BLAKE2B 75c651baffce01fdb277f40ad4404f6fe8e6a219250d52382ee4c88ece681cc3438c6c05fb010c57a22ecdf71518387934b77cbcbb2561ed8d395b592d88a84f SHA512 a5e4d77b3a2cc236aaed2df5d1e009087d5f1ffc07f07d5f2720d0d7d12ccd20b2d2b6adedc15f2fc197c2ac55da1432846e67e9cbbc4ee780489cb66fa3036e
+EBUILD gcc-4.5.4-r3.ebuild 665 BLAKE2B 2948e8405c2fdafc2025238d03e5d8e90dfc1cdc1e33984e1106a50ac83d1874831f5537acb572772b006a39a850274282a1c915a9b7eba5670cde238e0d307d SHA512 e1a733d7644144bbab9111651c2d75c65ca898e0d3e15a8385c025ab1a73a6dcd5a4482a5652e97c05f0606566df1f9c4b66860d51cd6a8f8bdeeda3c97a3851
+EBUILD gcc-4.6.4-r3.ebuild 746 BLAKE2B e56566d1dc637c6b87aa0073a525c2f639da1ab2c73ae03c3baa17df1e63b54113f5e2a63968117c76bfcb7c54c961f8bde6d9af179b706da6962baa60abda8e SHA512 32ce82c4393f221ba648d26c8171c15d27b3824c2cc6c9342394a5d2b87c76c7bfce1af76d51422bf5e79ae3c717010abfb3d82b873fa9ffd7dba015cc5690b7
+EBUILD gcc-4.7.4-r3.ebuild 1274 BLAKE2B f3243e7d4b7b8dc08cdd575c22f78a7b19b61d3f2c55808e59d5131654902d67cb8162992e0e9db74b734c333afc3390bed5fbc5a93caef48c1533287a937018 SHA512 86821e0d24bf1831d6d77d5230a8445582b282ebee0a3c4dcb23d63c553f01bbde9f7b14bcba6fc35cfb8be7ab1276781044705a0879d73baba2beda545a9070
+EBUILD gcc-4.8.5-r3.ebuild 1385 BLAKE2B 5ed907287fd0b729d4c808daeefdd95b45ef4aaf25a6a13bef266c4924a16d92af6b9aeee0bddddc558a33ad58d29d03b5c01f778a571b27907eef99c2ef304e SHA512 3eff1ba9c19a2a70b855cf0d46a67c6632589787d99a3261d1addbd8937bd1c1ff8f93124dd7e81e12fa4ba83e04bd4429dbdc3457016fb385c6ecbff92761ec
+EBUILD gcc-4.9.4-r1.ebuild 1444 BLAKE2B 3ecef2e4150f0e898226925961120df6ec7725e5dbf1cbc9ec5cb1382f5dca5ff2fa3f4c4ece97f17adf47a312e42d7edf53884b7d489f92e4b848f6d72249fc SHA512 c4fe2e86190c215b4ed0a90503d7db6921a3753472b21b077a4140b7b973d27b74d62ad5f73d4e0e9f598107e340bf389ace1c242bdc5a9849b9a4cb89ac7763
+EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B cd947d1ea85b03a37803702504ff438fdd776f97063737491dd947a64318596fe18ea8e5402e23169a6f6e72648de07babe7a4c9c71b5949efa50b9f72baeb78 SHA512 dfae1324898a4eb8b47ffdc3ae581b67f45155b041ee4672c7e843a6e7d6f193528dc5d882155e2d0717491d8ce210f3d3c85b92d3b4dcb45f14d68bdb072a1b
+EBUILD gcc-6.5.0-r1.ebuild 435 BLAKE2B a1aeb14a0db439fe6d56b562635252ba649380f2eb7ef75b9d9843a476eba49ca854ad7cb6daa71b22a0b94c51a24fdfe6cf9b49151ee2e37c4e1269f6a5641d SHA512 6b2ef62845bff9e70a8404190862a39fa42f4c919f2d7f1108e069df8dbf17c8704aba83530014f447f09f433f5d913ee51776c6d2b297a07cd3a75bd15a8ce1
+EBUILD gcc-7.4.0-r2.ebuild 448 BLAKE2B d2f5681ae0904e682159d38676c6c9aca80ae1f9eb41c6e188bbd9093a6bef0f4b988ee3d4c512a8d0cf21f9ee8683a541f90792219081a98500bbb07a403f74 SHA512 63f54acb749c4dda8857d2e6e60170ed2ec3bf66c12d94d5662fbc226df459317d6ad0e17a30ba94699c5fa4a77032e4b2a106e21bffd2594456e9aa78d58051
+EBUILD gcc-7.5.0.ebuild 447 BLAKE2B e9c72e8743ec650fd79244b81e7855bcd1ff1b4a13d8fe245f92e0ae2fd37c15609aa951429afcd2eecd4ac2d3f45786e5e2d8a72fac439aaf7cd7a525f3c4e9 SHA512 3b0e22f868d6ff1ec47b21196354873da4d01f21350aea79d1a86c218d4245237a9e5462ae3cb5486ba48736edf6fd1550729a0b49fb22cd87d0f4d99c4eb68d
+EBUILD gcc-8.3.0-r1.ebuild 586 BLAKE2B fb8c1ce54523dc7f32913d81132fe0123abc2e2c32e970f0565c14bf7ad4778077b9fa273ca9432f7d48dd5c8df6d27f44b682c6ca465936df4fe96e7c11c9c6 SHA512 c37df1dd80126227bca0f0aafef338f3ef29b2819cb3f26b20583c26254f4a6d6e8aece9a60bb15964f0ae64b669a4d497f48690f7003d8dd3b2f2b5d3347f9c
+EBUILD gcc-8.3.0-r3.ebuild 532 BLAKE2B 48e733971f3e98f99317cbd1d8b3ba5d8232a2892e45a2ce694974fe40c067d9fc711d612116f172c88b881a83785685f63040139108f9359c80e5d6de075ce1 SHA512 f6fdc443ceb35d895895e306494f9f3c2aba11508b97292d5daf75e7b0db52a5bbfbf4073f8a0fb011514b41c1dc14c5a615895d48f686c7eb640331bcc6e28b
+EBUILD gcc-8.4.0.ebuild 452 BLAKE2B bb0052ba82a0ac20e82b82232c9ac86fca0c9e714103f6fa8cf321e9bdb210f3de6b25a59af7efe82a6b07d3b92c51b5d4fa9a5659045b2a05ff292a637734ed SHA512 2eac9bceb5daade98ed2562e60c18daae14ec0dc59cbaf333f771b0978eebcadcee36bf28be715df4e53bcebeda57e0ef88dd00214657173857dd5ad6380e5c1
+EBUILD gcc-9.2.0-r2.ebuild 539 BLAKE2B d48f3dd9a33734a1db5546b6223bbb68ddb1f5831c92aa435fe6536af843f3754a688e728055b56999dd836a82e2bbc0f7dd9a4644d66d1c64ab127bba1af3a3 SHA512 a0b565c5a9c54f419c572a760f9b0b310e7008ca0d701a890bee224f7491c265e978215714d12a9565f4924f37c389bfd7fb1512d43e325e715d40ad3ec85f38
+EBUILD gcc-9.2.0-r3.ebuild 548 BLAKE2B 89ab2ddb997e6a6ff24151c074597040fc32dd755044b2e0d17bab595adc8fca34a253205dc5a6ba29f562b175a31854f74d51d4055aa0f95c53f92e64a6f03b SHA512 1a387d45deb6cbb58031c32c104f0dc40bdbcdc746b8e37e30d991f9b9461f87d46bdfd3498361f4b4c970a8059efba597f5b51062f103724724bd361169f9a4
+EBUILD gcc-9.2.0-r4.ebuild 452 BLAKE2B 5b1ced4bebbe5558068cde5d495e04a978292cdccb118f199642484a6cb4fdde844c31fcd99347271addaafa7c23e6d8dbbd13d1d54a08bbe9fbc470566817d3 SHA512 65ae72ce9e55b2c8a86375ffe8188d9e05fd82a077d8b5abac5b5971f152efb7610fce553af12f1746ec6f6bcf881fafe3db76a5098d99c9e56fdd3cc3091096
+EBUILD gcc-9.3.0.ebuild 452 BLAKE2B 0896974e52aeced6004b4bab01fea077803a8e92a0df45f1cd9df3bca0bc19bb1502ab764526749252888b0cc9a67ba2ef09ec07589768ba6d65390502a751fe SHA512 0016848b01a437b8d5e40e115fbab8311b525b41bab46b5c3eb47727abaf4d8b26828293407533792fc9aefd931af9b0dcd56c8853b5e9708081e62789e6ee6b
+MISC metadata.xml 2970 BLAKE2B 0ce2155b175a12d60088bd98d8679024ccdfda4b789f141ebea6a580cc42b1f4f484032862d63969439341193028a061cff2d7efe6582a18ea7e0a9e9d461ac7 SHA512 71e4b2ff3be2cfdf15a39c336ff984184fe1c3057f7690496d7ecad2ea10f7100127725860820f8109d40e682624dd9bb78943747fb7df6898f5a83482a06754
diff --git a/sys-devel/gcc/gcc-10.0.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.0.1_pre9999.ebuild
index 327bd78912fe..f405bdd58b63 100644
--- a/sys-devel/gcc/gcc-10.0.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.0.1_pre9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="9.2.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="4"
+PATCH_GCC_VER="9.3.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="2"
 
 inherit toolchain
 
@@ -25,22 +25,14 @@ fi
 
 src_prepare() {
 	local p ignore_patches=(
-		04_all_default-ssp-fix.patch # needs a port
 		11_all_extra-options.patch # needs a port
-		15_all_disable-systemtap-switch.patch # needs a port
+		27_all_default_ssp-buffer-size.patch # needs a port
 
 		12_all_pr55930-dependency-tracking.patch # upstreamed
 		25_all_ia64-bootstrap.patch # upstreamed
-		27_all_sparc-PIC-constant-PR91472.patch # upstreamed
-		28_all_sparc-fpu-subregs-91269.patch # upstreamed
-		29_all_mips_split_move-SEGV.patch # upstreamed
-		30_all_arm64-march-native.patch # upstreamed
-		31_all_openmp-for-SEGV.patch # upstreamed
-		32_all_sparc-PIC-constant-part2.patch # upstreamed
-		33_all_extend-lifetime.patch # upstreamed
 	)
 	for p in "${ignore_patches[@]}"; do
-		rm "${WORKDIR}"/patch/"${p}" || die "failed to delete '${p}'"
+		mv -v "${WORKDIR}"/patch/"${p}" "${WORKDIR}"/patch/"${p}"_disabled || die "failed to disable '${p}'"
 	done
 
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-3.4.6-r5.ebuild b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
index ac91373ace72..0357792e1a41 100644
--- a/sys-devel/gcc/gcc-3.4.6-r5.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain toolchain-funcs
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
index 439973da5a9f..43ffaf103129 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r4.ebuild b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
index fbb4b15a0529..fc9bca983e4d 100644
--- a/sys-devel/gcc/gcc-4.3.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7-r3.ebuild b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
index 75b290303ee9..52dfcf6ac1db 100644
--- a/sys-devel/gcc/gcc-4.4.7-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4-r3.ebuild b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
index 29074def7cf9..9c67148b0b46 100644
--- a/sys-devel/gcc/gcc-4.5.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4-r3.ebuild b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
index 2ec6905d63c5..a8e9019da817 100644
--- a/sys-devel/gcc/gcc-4.6.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.4-r3.ebuild b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
index 06c6d69ad260..adda46087cde 100644
--- a/sys-devel/gcc/gcc-4.7.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
index 4c11d5d39188..e446dbb082ab 100644
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index a1f1723df03a..7113d1a71602 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index 629e831d74a6..969cc8d4933f 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PATCH_VER="1.0"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.6.5"
+PIE_VER="1"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index d36fa0203915..482cd9d3769f 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PATCH_VER="2"
+PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 6a2a19d998d7..7b5233f3242a 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0.ebuild b/sys-devel/gcc/gcc-7.5.0.ebuild
index 61c06c69fc4e..1e003b833a53 100644
--- a/sys-devel/gcc/gcc-7.5.0.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PATCH_VER="1"
+PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index 2209d7327b78..064790171b85 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r3.ebuild b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
index 55d50a762419..5eb2eb8f0060 100644
--- a/sys-devel/gcc/gcc-8.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0.ebuild b/sys-devel/gcc/gcc-8.4.0.ebuild
new file mode 100644
index 000000000000..e4e2688066e7
--- /dev/null
+++ b/sys-devel/gcc/gcc-8.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
index 97327a276552..c5aeb3e361f7 100644
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 807cdd974bad..b1ae22cf7f4d 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0-r4.ebuild b/sys-devel/gcc/gcc-9.2.0-r4.ebuild
index b7ea0272ca78..c5057f857b75 100644
--- a/sys-devel/gcc/gcc-9.2.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r4.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="7"
 
-PATCH_VER="5"
+PATCH_VER="6"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0.ebuild b/sys-devel/gcc/gcc-9.3.0.ebuild
new file mode 100644
index 000000000000..257d96bff95c
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="2"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 393817b6e620..06bf70ec1ea0 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Toolchain Project</name>
   </maintainer>
   <use>
+    <flag name="ada">Build the ADA language (GNAT) frontend</flag>
     <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
       (AWT) peer support on top of GTK+</flag>
     <flag name="boundschecking">Add the bounds checking patch by Haj Ten Brugge,
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 7567b691614c..57414936dadf 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,11 +1,5 @@
-AUX gdb-8.3.1-gcc-10.patch 6940 BLAKE2B c3df7c53e9763984b43601361d6d157f7b8586b2ad56488481483e7ee3a0ff17b194e68e729a7854bb30d4476029064cdbc6c983b0107e090291f26015db6df4 SHA512 6b8d82afef1fc705b6255334a970c81ddb65a34156d3e1d9134443d825f870bfee76f6a5eb2992e5d2baf2628ba7fa19f33501e8e8967ebc30b3fab3429e0710
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
-DIST gdb-8.3.1.tar.xz 20489528 BLAKE2B 5a671f620a2ed3337486a8ff53b93d65b3b6079e59ea07bc0f31e3ea6d459ced1d8549a76cfcf124762e0890e243eaabcf8b204bfc631002e759339a89b9bf9a SHA512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a
-DIST gdb-8.3.tar.xz 20490300 BLAKE2B 24b2a2a9bda7ae8093f757e42d6d0ab5642ff1d7e5a832896c28c5b17961166072c0dae158c04d7f7660cb059194c259bcff71ad5763960027b0ac3d7045eb1a SHA512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1
 DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
-EBUILD gdb-8.3.1-r1.ebuild 6930 BLAKE2B 46e1ae2b125a405c30ffa938e98525a60df78b8f2e7138706856660bdd0f3bc36164e69b3fd72359b7bdc2ad864dbbae3108ea982b40d1897da74fbecb16fbd7 SHA512 e73f1b726dc57d6bfe8dc6c56465449ac64e5ad690f7e75bbf4086affdb16f4ead2ffbba191940fd75ad30f254bce52983c9c448c1d81b07881a36dccb8dcd1f
-EBUILD gdb-8.3.1.ebuild 6867 BLAKE2B df0082c86c451ab3ee1e01571cfef9b5bc8ea2ec0dfc1205db6da6e40b5407e8b5609096e3ad10f2ad843d21212501e668d0b99f48cb9cfb23002088f6854b2a SHA512 b92f997211bb8f50b8c97cf991b40467ad9042caca51eeb7c47767d484d0ab248b2aa4a2e9ed306adecf0c2334d0747d0b7324ff0d0cbdf6447d8ef28e8336c7
-EBUILD gdb-8.3.ebuild 6624 BLAKE2B 116845931bedb8e0e5f4ff3d4d89cb234e18bdd07cfb0c58f4d453e9129954386ddd4859b17d1e0b1bb127b50d130e0c1777fbb3764f789ecfc4681b32bc68d7 SHA512 16f59904ba8855dab383dfb50725e59650dc149c768a4b4bdc6c26860d96f37924b5a0bc6a5962a50ca95a5aae5467ab4715efc50d0e9704c73923b35c0ec1cc
-EBUILD gdb-9.1.ebuild 7257 BLAKE2B 0c9120fb581a279bc5571f60fbd997f7eff7bddeb4936699ad964ada9370db49cf95fe875a44b985d42621cfa8cd26000fd9476b9deeb6e5d024dc1526adb15f SHA512 a90ea55418f4d4f0f7cc880aab37f2297fd8a9770752de1c7d0c89b2890fe840bbd9e16657b16120984d5d1f58c07ffcf3dbb4b2c59601edb67e6f818dba450f
-EBUILD gdb-9999.ebuild 6914 BLAKE2B c56d4eac9cab52a0c98003f36657b7c58c700d357074350897aca69fca15753f57c761db6fb784145cf87bde6681f9b84e20b381bb32f20a176385ee50b4e818 SHA512 252f6a6584ecc22b3d965c6f2a8ae963b6cc58358358f9c792f024b1cf38fb05f1cd1106bdddf2037fe7fb9eb1b7e26d36493fd4b6c766a88217d8eebd64b893
+EBUILD gdb-9.1.ebuild 7386 BLAKE2B d208d132d8e51e0c7596bda3d4e4d3a25e8c7efccfe046e859cbc1df6cb8b6cea0ec2dadf807b9d917e21f7ececb1b20004c7372b0f74fb8fa0b41aefc6e2e43 SHA512 f091d4808fc96b8584ab6b0ca585535017eceab9771ff9d21e04916a1832a2fbdf8664321a0bb93c56325bcf5be5074150a1b1f2e38114364d13b63ea66c498f
+EBUILD gdb-9999.ebuild 7052 BLAKE2B db9b949e97d115da1d8a05f834cd7d259147728dd322f983d210675dbcaa166c1564a4d3c12ceb370145bf755a7161f20c64be94979da0dd516d83ac187b1846 SHA512 0d2551744cf15162e26216562ced571704c3ecb5d99fdd28305b95552684a0ec2afc083a5b27936822e1e33756430da114b358a9d1a399bcc8ebab8362d24e3a
 MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
diff --git a/sys-devel/gdb/files/gdb-8.3.1-gcc-10.patch b/sys-devel/gdb/files/gdb-8.3.1-gcc-10.patch
deleted file mode 100644
index affc3b7392a4..000000000000
--- a/sys-devel/gdb/files/gdb-8.3.1-gcc-10.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 851c0536cabb661847c45c73ebd796eb3299066b Mon Sep 17 00:00:00 2001
-Date: Tue, 26 Nov 2019 12:52:56 -0300
-Subject: [PATCH] [ARM, sim] Fix build error and warnings
-From: Luis Machado <luis.machado@linaro.org>
-
-Newer GCC's have switched to -fno-common by default, and this breaks the build
-for the ARM sim, like this:
-
-binutils-gdb.git~gdb-8.3-release/sim/arm/maverick.c:65: multiple definition of `DSPsc'; libsim.a(wrapper.o):binutils-gdb.git~gdb-8.3-release/sim/arm/wrapper.c:134: first defined here
-binutils-gdb.git~gdb-8.3-release/sim/arm/maverick.c:64: multiple definition of `DSPacc'; libsim.a(wrapper.o):binutils-gdb.git~gdb-8.3-release/sim/arm/wrapper.c:133: first defined here
-binutils-gdb.git~gdb-8.3-release/sim/arm/maverick.c:63: multiple definition of `DSPregs'; libsim.a(wrapper.o):binutils-gdb.git~gdb-8.3-release/sim/arm/wrapper.c:132: first defined here
-
-I also noticed a few warnings due to mismatching types, as follows:
-
-../../../../repos/binutils-gdb/sim/arm/wrapper.c: In function ‘sim_create_inferior’:
-../../../../repos/binutils-gdb/sim/arm/wrapper.c:335:16: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
-       for (arg = argv; *arg != NULL; arg++)
-                ^
-../../../../repos/binutils-gdb/sim/arm/wrapper.c:342:8: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
-    arg = argv;
-        ^
-../../../../repos/binutils-gdb/sim/arm/wrapper.c:345:13: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
-    for (arg = argv; *arg != NULL; arg++)
-             ^
-The following patch fixes both of the above.
-
-Change-Id: I21db699d3b61b2de8c44053e47be4387285af28f
----
- sim/arm/armemu.c   |  4 ----
- sim/arm/arminit.c  |  4 ++++
- sim/arm/maverick.c | 35 +++++------------------------------
- sim/arm/maverick.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- sim/arm/wrapper.c  | 35 ++---------------------------------
- create mode 100644 sim/arm/maverick.h
-
---- a/sim/arm/armemu.c
-+++ b/sim/arm/armemu.c
-@@ -1140,10 +1140,6 @@ handle_VFP_move (ARMul_State * state, ARMword instr)
- 
- /* EMULATION of ARM6.  */
- 
--/* The PC pipeline value depends on whether ARM
--   or Thumb instructions are being executed.  */
--ARMword isize;
--
- ARMword
- #ifdef MODE32
- ARMul_Emulate32 (ARMul_State * state)
---- a/sim/arm/arminit.c
-+++ b/sim/arm/arminit.c
-@@ -40,6 +40,10 @@ unsigned ARMul_MultTable[32] =
- ARMword ARMul_ImmedTable[4096];	/* immediate DP LHS values */
- char ARMul_BitList[256];	/* number of bits in a byte table */
- 
-+/* The PC pipeline value depends on whether ARM
-+   or Thumb instructions are being executed.  */
-+ARMword isize;
-+
- /***************************************************************************\
- *         Call this routine once to set up the emulator's tables.           *
- \***************************************************************************/
---- a/sim/arm/maverick.c
-+++ b/sim/arm/maverick.c
-@@ -19,6 +19,7 @@
- #include "armdefs.h"
- #include "ansidecl.h"
- #include "armemu.h"
-+#include "maverick.h"
- 
- /*#define CIRRUS_DEBUG 1	*/
- #if CIRRUS_DEBUG
-@@ -30,36 +31,10 @@
- #define POS64(i) ( (~(i)) >> 63 )
- #define NEG64(i) ( (i) >> 63 )
- 
--/* Define Co-Processor instruction handlers here.  */
--
--/* Here's ARMulator's DSP definition.  A few things to note:
--   1) it has 16 64-bit registers and 4 72-bit accumulators
--   2) you can only access its registers with MCR and MRC.  */
--
--/* We can't define these in here because this file might not be linked
--   unless the target is arm9e-*.  They are defined in wrapper.c.
--   Eventually the simulator should be made to handle any coprocessor
--   at run time.  */
--struct maverick_regs
--{
--  union
--  {
--    int i;
--    float f;
--  } upper;
--
--  union
--  {
--    int i;
--    float f;
--  } lower;
--};
--
--union maverick_acc_regs
--{
--  long double ld;		/* Acc registers are 72-bits.  */
--};
--
-+/* These variables are defined here and made extern in maverick.h for use
-+   in wrapper.c for now.
-+   Eventually the simulator should be made to handle any coprocessor at run
-+   time.  */
- struct maverick_regs DSPregs[16];
- union maverick_acc_regs DSPacc[4];
- ARMword DSPsc;
---- /dev/null
-+++ b/sim/arm/maverick.h
-@@ -0,0 +1,46 @@
-+/*  maverick.h -- Cirrus/DSP co-processor interface header
-+    Copyright (C) 2003-2019 Free Software Foundation, Inc.
-+    Contributed by Aldy Hernandez (aldyh@redhat.com).
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-+
-+/* Define Co-Processor instruction handlers here.  */
-+
-+/* Here's ARMulator's DSP definition.  A few things to note:
-+   1) it has 16 64-bit registers and 4 72-bit accumulators
-+   2) you can only access its registers with MCR and MRC.  */
-+
-+struct maverick_regs
-+{
-+  union
-+  {
-+    int i;
-+    float f;
-+  } upper;
-+
-+  union
-+  {
-+    int i;
-+    float f;
-+  } lower;
-+};
-+
-+union maverick_acc_regs
-+{
-+  long double ld;		/* Acc registers are 72-bits.  */
-+};
-+
-+extern struct maverick_regs DSPregs[16];
-+extern union maverick_acc_regs DSPacc[4];
-+extern ARMword DSPsc;
---- a/sim/arm/wrapper.c
-+++ b/sim/arm/wrapper.c
-@@ -37,6 +37,7 @@
- #include "gdb/signals.h"
- #include "libiberty.h"
- #include "iwmmxt.h"
-+#include "maverick.h"
- 
- /* TODO: This should get pulled from the SIM_DESC.  */
- host_callback *sim_callback;
-@@ -101,38 +102,6 @@ print_insn (ARMword instr)
-   fprintf (stderr, " %*s\n", size, opbuf);
- }
- 
--/* Cirrus DSP registers.
--
--   We need to define these registers outside of maverick.c because
--   maverick.c might not be linked in unless --target=arm9e-* in which
--   case wrapper.c will not compile because it tries to access Cirrus
--   registers.  This should all go away once we get the Cirrus and ARM
--   Coprocessor to coexist in armcopro.c-- aldyh.  */
--
--struct maverick_regs
--{
--  union
--  {
--    int i;
--    float f;
--  } upper;
--
--  union
--  {
--    int i;
--    float f;
--  } lower;
--};
--
--union maverick_acc_regs
--{
--  long double ld;		/* Acc registers are 72-bits.  */
--};
--
--struct maverick_regs     DSPregs[16];
--union maverick_acc_regs  DSPacc[4];
--ARMword DSPsc;
--
- static void
- init (void)
- {
-@@ -236,7 +205,7 @@ sim_create_inferior (SIM_DESC sd ATTRIBUTE_UNUSED,
- {
-   int argvlen = 0;
-   int mach;
--  char **arg;
-+  char * const *arg;
- 
-   init ();
- 
--- 
-2.25.0
-
diff --git a/sys-devel/gdb/gdb-8.3.1-r1.ebuild b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
deleted file mode 100644
index 015c3bc58e76..000000000000
--- a/sys-devel/gdb/gdb-8.3.1-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit eutils flag-o-matic python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-MY_PV=${PV}
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-# ia64 kernel crashes when gdb testsuite is running
-# hppa kernel crashes when gdb testsuite is running
-RESTRICT="
-	hppa? ( test )
-	ia64? ( test )
-
-	!test? ( test )
-"
-
-RDEPEND="
-	client? (
-		dev-libs/mpfr:0=
-		>=sys-libs/ncurses-5.2-r2:0=
-		sys-libs/readline:0=
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		xml? ( dev-libs/expat )
-		sys-libs/zlib
-	)
-	source-highlight? (
-		dev-util/source-highlight
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-8.3.1-gcc-10.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with xml expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use_enable source-highlight)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-		)
-	fi
-	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	if use server && ! use client; then
-		cd gdb/gdbserver || die
-	fi
-	default
-	if use client; then
-		find "${ED}"/usr -name libiberty.a -delete || die
-	fi
-	cd "${S}" || die
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-
-	# gcore is part of ubin on freebsd
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		rm "${ED}"/usr/bin/gcore || die
-	fi
-
-	if use python; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
deleted file mode 100644
index bdc663153f47..000000000000
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit eutils flag-o-matic python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-# ia64 kernel crashes when gdb testsuite is running
-# hppa kernel crashes when gdb testsuite is running
-RESTRICT="
-	hppa? ( test )
-	ia64? ( test )
-
-	!test? ( test )
-"
-
-RDEPEND="
-	client? (
-		dev-libs/mpfr:0=
-		>=sys-libs/ncurses-5.2-r2:0=
-		sys-libs/readline:0=
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		xml? ( dev-libs/expat )
-		sys-libs/zlib
-	)
-	source-highlight? (
-		dev-util/source-highlight
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
-
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with xml expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use_enable source-highlight)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-		)
-	fi
-	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	if use server && ! use client; then
-		cd gdb/gdbserver || die
-	fi
-	default
-	if use client; then
-		find "${ED}"/usr -name libiberty.a -delete || die
-	fi
-	cd "${S}" || die
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-
-	# gcore is part of ubin on freebsd
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		rm "${ED}"/usr/bin/gcore || die
-	fi
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
deleted file mode 100644
index 8e01738db46c..000000000000
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit eutils flag-o-matic python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-# ia64 kernel crashes when gdb testsuite is running
-# hppa kernel crashes when gdb testsuite is running
-RESTRICT="
-	hppa? ( test )
-	ia64? ( test )
-
-	!test? ( test )
-"
-
-RDEPEND="
-	client? (
-		dev-libs/mpfr:0=
-		>=sys-libs/ncurses-5.2-r2:0=
-		sys-libs/readline:0=
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		xml? ( dev-libs/expat )
-		sys-libs/zlib
-	)
-	source-highlight? (
-		dev-util/source-highlight
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
-
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with xml expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use_enable source-highlight)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-		)
-	fi
-	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	if use server && ! use client; then
-		cd gdb/gdbserver || die
-	fi
-	default
-	if use client; then
-		find "${ED}"/usr -name libiberty.a -delete || die
-	fi
-	cd "${S}" || die
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-
-	# gcore is part of ubin on freebsd
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		rm "${ED}"/usr/bin/gcore || die
-	fi
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-9.1.ebuild
index c27518d0c97d..9361fca6fb0c 100644
--- a/sys-devel/gdb/gdb-9.1.ebuild
+++ b/sys-devel/gdb/gdb-9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit eutils flag-o-matic python-single-r1
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -17,7 +17,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 case ${PV} in
 9999*)
 	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
 	inherit git-r3
 	SRC_URI=""
 	;;
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
@@ -183,6 +183,9 @@ src_configure() {
 		myconf+=( --disable-largefile )
 	fi
 
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
 	mkdir "${GDB_BUILD_DIR}" || die
 	pushd "${GDB_BUILD_DIR}" || die
 		ECONF_SOURCE=${S}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 06bc04042454..056b99bbc890 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit eutils flag-o-matic python-single-r1
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -17,7 +17,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 case ${PV} in
 9999*)
 	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
 	inherit git-r3
 	SRC_URI=""
 	;;
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
@@ -181,6 +181,9 @@ src_configure() {
 		myconf+=( --disable-largefile )
 	fi
 
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
 	econf "${myconf[@]}"
 }
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index e854b80ebc44..6f81c7e830e3 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -4,6 +4,6 @@ AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f298
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
-EBUILD gettext-0.20.1.ebuild 4052 BLAKE2B 747f6257773f23d4eab40735ead1976e7a9af9516076e935b06f9e34009f68d5e085c395adaf67fede4144691c764c86abb3c66372cd28fa70e58ba44260717b SHA512 911945d06bcc82f00f2b678e71759c869c9ebb738f34d5e915e73be017345845dc0acfbbf02b9030e77679dd94351317a0ede74bb8f98dd47111430eb6030c11
-EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc
+EBUILD gettext-0.20.1.ebuild 4050 BLAKE2B db78ac840a542fba492bb46160923cb25ccfdc7a35f9603704a2c1181bd730a09561ef83f3794c67fd641d73845d4cf8e5447c7909ed8c540da048b342ba457a SHA512 ba0ee7e5b7006cdb48fce1b46760c67dee4464218ebce7ff572018ae825254b5b7fffa3c620e77991d7bf9b01f5344b2f10d58937c9e6557ac549606eb203524
+EBUILD gettext-0.21_rc1.ebuild 4184 BLAKE2B e26e4dcff3b20b349fa8d4d93be9eca758a3af6e721a8955816010793f051444d9d68ed1a232e15434f8fa6c78e26d34f396c2c633b02451f5b70e348443fe84 SHA512 cfa31d901b80dd375836ee010290e668874d62cb14faf7c42f1659a5983367384066873f23da3695454edb3d3d60f23885163e339df903f4285597da4fdcfd14
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 8bea4b979fc0..03ba2345d043 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
diff --git a/sys-devel/gettext/gettext-0.21_rc1.ebuild b/sys-devel/gettext/gettext-0.21_rc1.ebuild
index 286653708ac9..5904f3a059c7 100644
--- a/sys-devel/gettext/gettext-0.21_rc1.ebuild
+++ b/sys-devel/gettext/gettext-0.21_rc1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 4ddcbcff48d9..627d37657ad3 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,6 +1,6 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
 AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1318 BLAKE2B 1844a1c52406e4142d2b966f485de914a63dd1553e1dfb6f07dfc5860884df13228ef33ca782870a90f5f04de67f21f35028855f6da1bcfaf279fff417b603e9 SHA512 9561f39564bcba61495665e984e0e4539459ec1a342461364849f74cb86adfe6e71867913f0aa98540a4c9a54d0932f133b5541ea41e59f9b32d0278d22db17f
 DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
-EBUILD gnuconfig-20190912.ebuild 1524 BLAKE2B e742819c3e23806502ec35dd93435869dbc9b29ca0b6e521e766a11b4212a8f6fdf338eeb7090482bbe86e513e3f2cef965b0508b17d519d382daeb719f89b44 SHA512 720ea760ba3066bdaa6499e85a6637cf2892fba21356ba2c04b3ced331d976f63fb7b0f7fc76e9b2c2dbacc2a1300d1683244bc4d7aa760202cefcdd4a57b622
-EBUILD gnuconfig-99999999.ebuild 1536 BLAKE2B 0e7fc3cd1f4e700e12018cb16ad17492d5f4b8b1c61b02591bb3d6ce7be14899bf451d9c46a01d1c88c4819d9bfd4818b9c387ada8477950e8d1639653f02e38 SHA512 b27df0d8f71192ab3fc5f33cbb254700e122f0244426d2bca526d065e5fe1266abe9efcb116417e2a86dbb5e1175a9e84d570e86de79824c64d5bd7dd2ca4f91
+EBUILD gnuconfig-20190912.ebuild 1522 BLAKE2B eb9b891f19ec50284fc80a9c3c58633e55631023f35ee63975b369cecfe0fcb3f435a5824cf93aeb1933c328e867568afdd5ab5e0da665917afcb4b277fad626 SHA512 fe1b9c1c5665d1a2d39fd477b8a46e16a1fd2b6d29a0ad3856bc3cab9b4f1290290be4fbadccbb017df1c12bf56106542f296e2165d021d372d139f4f751c781
+EBUILD gnuconfig-99999999.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
index 9a1ccd61f369..66cf1ce6466c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 5d49b8940d9d..7eb2a8392c5e 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 5775a5cc3c6f..861623b46834 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,6 +1,6 @@
 AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 BLAKE2B 945e234afcbbf2b5d737d7a4b9fb9282070ece739e1e487723baf9aa4e7c0777ec7b43cdd4957c89b9fc42c15eb2aff0564b370dd6b3e1a3849bf32680c69bd1 SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
-AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5
+AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-4.1.2-patches-1.0.1.tar.bz2 43294 BLAKE2B e8040fb94925a622e5fffee820cb1094989210decab95175844ce729216a439b730381fa457e3a607f124c4b9d249427bfdd85fa9e62cb96199a911509c06736 SHA512 79f1d47d364462325a927b35b66bbdc68c100dbb6c86a6dd524d0e1cd09b7135c3789e80b71539cec63befbeea1a0e9b456b53ab0a5580b64509f78231d3fdc5
 DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
 DIST gcc-4.2.4-patches-1.0.tar.bz2 21809 BLAKE2B 5ae6eddeeb6f39fc6364f093d7ec166d053dce33d25d0f0d128dcdb95de6a203b993b60302b56bb347e76fbb50f932642e64ae0dadcc7d824600056e1e26432b SHA512 20eb3fa790e5cc1bd66c9ad1915c73c20ae8977d6789addaf4863184e6d5c25ab9b0f2c40e3ad08a6859825b2e97bf0839e0a616730362072aa35e8ae158a427
@@ -45,6 +45,8 @@ DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604ed
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
 DIST gcc-9.2.0-patches-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c
+DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 EBUILD kgcc64-4.1.2.ebuild 1168 BLAKE2B b9092641f591201dcb6c59767dac678edc30552927d0850358b308544ea5c85edcdb160db582348679b24dd2a56350476ac6292ab5bed5b0f9fee6df23618896 SHA512 20afe58f1789807d68af569b54cfa0222d82cc8b9f73a50a754f8d0c8ed70a9655ddfb33043caf252fad28563211f716e51204a25fedbfbe5c0d8d47fb8f5fd4
 EBUILD kgcc64-4.2.4.ebuild 1044 BLAKE2B fe27d00088a1dbbafe880dd2ab3fcbb3a5588e918b9a0222225aa8ce0cf46b378bee9f2c77ebb8ad0a1fc7e81d4f6aac5f7fe47428164674adda74d760e49e8e SHA512 604992390f8babdeeacc5afa90934a7b6bf0d2d70d31e4dfda597da8a5f8d62f1ba6c1ccd491ef4ca814e87cc0d9491b3907e452ab51c84f15c5d5486c302c02
 EBUILD kgcc64-4.3.5.ebuild 1101 BLAKE2B 9dc7c4a0948ad9d187749c4a4334cb1755150069d73be88b5e297bc904cc2f54204af9da37347dc787cf6d9ba16401eb422f260480d132d7aedf6f74ef897481 SHA512 04f1dda7aab17364756555b4bbec110437166b6a361067b6e29dd134cdf912581ec76605be99e06a93861b71654867a3af98f91e3e1c35556401422ee9857628
@@ -67,4 +69,5 @@ EBUILD kgcc64-8.2.0.ebuild 1417 BLAKE2B 5719bf546721d85a78dcf81a0264cb51bbbfef5f
 EBUILD kgcc64-8.3.0.ebuild 1253 BLAKE2B 380cc764ddf5e4619e33f62795922ba3cf64c196c8937b74e491dfce25427c60fda3105a38a484c465123852f6ec89343a301a74043541db786e2d828c499cea SHA512 08d00606e0b5f603d66e3d7398c56831c4a9f8c612a42955eff195c60c3e6a2cdaa9bb203fd076a70795eb4ef9eb41e445f0f41dc204e250fcd770bd9c1c53ce
 EBUILD kgcc64-9.1.0.ebuild 1084 BLAKE2B 4fd8dafcfd8dacbe4daea58457434a0f66da7b09589b4ac4281d9b13cfad92f9bc82e6f19f7f3742267b2b3d20a0d86d135daf82ba1e729535054850dfe3ede3 SHA512 4892d29f5a0ef47402b37966e218ecc722a0352ffcb4fc8b77681b58b2c77788a523be434df77f6b252cc3542fcc0d8950a6553d05077bafe44dc6ba3065edc8
 EBUILD kgcc64-9.2.0.ebuild 1081 BLAKE2B 3788816258768aa3c3ce69aaafe0fa371cc5c728f3cfb12f4444ae3abde90a457144d7a9ca34008ff75a017dc61dcc988942e0370ba5073f9270fd5de230a558 SHA512 8f2db222fdc4e4987bf2274365f8d419875c2b3fb66b4108bb755580e6602f84627cc70a29bd84765b3ee29299a25cab7451b3b9e23382d5db4947b27849030c
+EBUILD kgcc64-9.3.0-r1.ebuild 1082 BLAKE2B 2faa8827fc02f66120fd985a04fc21edcac82246b088fdf8f7d88983a633cdc556a0b948fbd9c36b6a6f5d1e1eadfe4e65def7c5d4eea0b1ff821b92893e80ec SHA512 cc21f83020e04850811795158cab75cb809cfcf88144b4d874864d468ad039e365ba1f8328d9d9ee7e6720a74a822d9c73a6b29bf7b3da4131a4fac47f8eb1eb
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/files/gcc-configure-texinfo.patch b/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
index ddc098ddbd58..99e90998a469 100644
--- a/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
+++ b/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
@@ -4,8 +4,8 @@ that it violates the cheesy version grep.
 
 http://bugs.gentoo.org/198182
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -3573,6 +3573,6 @@
        :
      else
diff --git a/sys-devel/kgcc64/kgcc64-9.3.0-r1.ebuild b/sys-devel/kgcc64/kgcc64-9.3.0-r1.ebuild
new file mode 100644
index 000000000000..dd61d3fd7a6f
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="2"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="
+	hppa? ( sys-devel/binutils-hppa64 )
+	!sys-devel/gcc-hppa64
+	!sys-devel/gcc-mips64
+	!sys-devel/gcc-powerpc64
+	!sys-devel/gcc-sparc64"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 68d365eddcce..2d1a891e2ee4 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,6 +13,6 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r6.ebuild 3583 BLAKE2B 84848878036290a5e51be69d5aede07f58069618c8ae3b563dbede35872bfea22d1d076644178fba08b8acf5afef0a731af749e6d897543ce183809356f3cb6b SHA512 c4e2a42524beaac9b2744be52990e51702ace31ff5096e359ff16cacbcd48be7637773b76349d270ce29abfee7e381541137cbb29f915e60dd1f37dcdf9b7de7
-EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
+EBUILD libtool-2.4.6-r6.ebuild 3581 BLAKE2B 3a2c3c2b125abca2e928bddedceb46b402e55dc26dc33358d97273270a66ab54d4d2d84d75a942cdb0d8d5418fc7f67fd8f003e7e51506f2aafeff11e3425b3d SHA512 6adeb56c8d968515a4043c9472f01ec2a423040825dbc18051dfcf75d8c89c6db509203ebca370c26addf2b61d11a6e828d8dc04a4fdc3afbd1189d696af04ad
+EBUILD libtool-9999.ebuild 3232 BLAKE2B f434eefabfb1d28837c5e3589678835d281adac44a4334ec0c9be7eac54f3873cd7e84ac00f54048742fae6e96f0b256a680b697d93b44029591e6052e3cfe57 SHA512 309a4430005152d74b0bbfdc2feb7a4a337025caf73659a502e7463962e137e937b32893ac50176e4429cd19963786fdbf32af81943f5782c65f2266b60522d8
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index d6c57a67a5a0..1e876837090c 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index a929635d35d7..edb5530b2803 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 4d74acf216da..93c4c036d4e0 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,14 +2,12 @@ DIST lld-7.1.0.src.tar.xz 912604 BLAKE2B f18a96233217a92f4c3033446dbfd03d161c4f9
 DIST lld-8.0.1.src.tar.xz 996440 BLAKE2B 9e205427f5534a69b665620b5ecf6713194421a35e3e815d257545d5a1e8a11d42e32abd685df1d439463b6e9e2dd6134755b458196edcd7c7807b89c779027d SHA512 646418d4a4ce922d1a69e9bf2e472f5d758f25ec21b80a2c66dfe5effc59c9c312fb167cf64ee2d8a2ced986e7474ed3d2996a38be66fbf63c574229d28e0900
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.0.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
-EBUILD lld-10.0.0_rc1.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
-EBUILD lld-10.0.0_rc2.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
+EBUILD lld-10.0.0.ebuild 1483 BLAKE2B 7d949cb37acc2568db0915086fce712ad854df4fe0878ae42759f93c69a119e9f7f24fa8cd5047bc225b037d4afa178ce8e02f11eb9e1cd0e8c60ac3fe8a422d SHA512 bab240f2abe5b81f811080695d419683a423865dd38c62d8d65e7d2421aeb1b3d4da511298d78cd8b20ef53c18772f51367b25fc2b6252070297ceb262ffb1a2
 EBUILD lld-11.0.0.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
 EBUILD lld-7.1.0.ebuild 1725 BLAKE2B 61454551884ee0d7d50ea65b4816ad516784f81965dca35ee696547e367ac446692c3430660f3d0b82446974d264ca0671517a2d3ed04fe3d263a4b435657923 SHA512 10fc7671b1afc5db3cc2a854e6b1f7c6b297c67967c6a90efb392537f5dc3b7150f4efe60a92554b2332dd2ce27284405053dc6c42d4a51ee739ead9ca65d1f4
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
-EBUILD lld-9.0.1.ebuild 1324 BLAKE2B 2f394afbbda45b7525ac8ddd76608720202c5a015d9c3e9658bc786195a969c504ccef4e3542391fc72fe87c9c90d10445756e8ff5baadd6040d5006b67b1c72 SHA512 4c6b6852d34f9108d9bc9ab702717b18d8bf740076efcac9627cfc66a9aa25f5e7da736f18723c580e644f3f0d4369ad8dc61a9324ce78f93f46d4353e136dda
+EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0_rc2.ebuild b/sys-devel/lld/lld-10.0.0.ebuild
index f15808abce81..13345ccde36f 100644
--- a/sys-devel/lld/lld-10.0.0_rc2.ebuild
+++ b/sys-devel/lld/lld-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-10.0.0_rc1.ebuild b/sys-devel/lld/lld-10.0.0_rc1.ebuild
deleted file mode 100644
index 664086deab85..000000000000
--- a/sys-devel/lld/lld-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
-}
-
-src_install() {
-	cmake-utils_src_install
-	# LLD has no shared libraries, so strip it all for the time being
-	rm -r "${ED}"/usr/{include,lib*} || die
-}
diff --git a/sys-devel/lld/lld-9.0.1.ebuild b/sys-devel/lld/lld-9.0.1.ebuild
index 57dccad139ec..a0b12c0bc92d 100644
--- a/sys-devel/lld/lld-9.0.1.ebuild
+++ b/sys-devel/lld/lld-9.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 8ee8ece99f26..ebf0bd246b81 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,13 +1,11 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.0.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
-EBUILD llvm-common-10.0.0_rc1.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
-EBUILD llvm-common-10.0.0_rc2.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-10.0.0.ebuild 604 BLAKE2B fe149a945f69a83939278f76189b47786f68f2f7953c948825ca6cf8caa5e3d986a21e87f23f8549160475a36a3c9fad30724979681141316c2bd84ba44125f0 SHA512 0798acea6da50210e14c460637d5f38f7d3c18f9de13ee36e2dd2424b475f3c343c0c4d8531811063056b4682a8d20b1de881044bdf47bec1fc421996568f98f
 EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-7.1.0.ebuild 823 BLAKE2B 303878e56feb88de440edeb2e36b9f1ab6068b661e3acf2c74eb28d41506f3159f61f9b23875159f86fb87ba61b0dde94a8d31349e00c8712f6fa674cf2c0cbe SHA512 d8617f793fddbca40aab02ccca07dd1ea886666800483c7c8e9ad612bfa3cdc1fad67c151677a875a96c1b07acf639eb5a279371488f90d97da58d0dee971372
 EBUILD llvm-common-8.0.1.ebuild 855 BLAKE2B 81171ca3ce7d05be60c151d814ceb592e18fd2d8986db8a1106662727d0b1f94011cac9057f7fe8b398197b2d8fe588e684dacf7ed6b4d93777f4a8cdbfdc644 SHA512 f6a1f1b256bb1dae884dcecbeb6b22c295407ea3b3126839ac99c7c6e745c074c77167f52d7790b38501a0cab5680109274323ff8f6d27ea9b39bdec82ff8f7f
-EBUILD llvm-common-9.0.1.ebuild 600 BLAKE2B 347ed293256548fee7b25fe62d5997e20d3e2c74a7fb98e2573f043036a972e1c0799136a00e9127fc4f7f4518c1bfdea24474e7515194f4de9d2d8a23a8526e SHA512 392e0c4fbd8e9dbaa9f58215629eacf84fd2db00dd95d380416264548abc251a83046da88983eccaa5167a387329f148d7ff2435e23eca61f8bb13631289392b
+EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0_rc1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
index df9cf92b47a1..19901996d6d4 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0_rc1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0_rc2.ebuild
deleted file mode 100644
index df9cf92b47a1..000000000000
--- a/sys-devel/llvm-common/llvm-common-10.0.0_rc2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
index 2ad50dae7076..d12935e080d2 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 07d1017ada6a..061623741a43 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -16,6 +16,7 @@ DIST llvm-roc-ocl-2.8.0.tar.gz 50245388 BLAKE2B 29aa4fdb08b5c3ca1ec41f8948b48d46
 DIST llvm-roc-ocl-2.9.0.tar.gz 50246154 BLAKE2B 5ed8faf4582a41dac3bdc71a9fc6e12e3f70652fe80d4659315589e5c6f6326bc03853cea1d3e7acf6b210dd4c83056bae27aded3e173756d6f7c2c5694ae386 SHA512 e29767bb92bf719b7f3b6d2853dc61d6cb968e3f0dc54714ee6a78ff5340139935ce0d1cf3124c5757d96f93af01e0f9927e72d29a35b84229e44e7a69e6d391
 DIST llvm-roc-ocl-3.0.0.tar.gz 117363122 BLAKE2B a85e456e715629fbb3349e13e50a62aee7c82c6479127d7e46ff2de13f0eab108dd0332136aa736c30ed46c1563207b7ab22df0f7f53404315d51f0a172b5e86 SHA512 7d1281fc1628e4e88ddd740ccf03107cdccf86178046dfe79efd6b503193b3be4e23a67363f24f1d6250a156da86fe0d93933d9c67510b755d1e454e7bbedb68
 DIST llvm-roc-ocl-3.1.0.tar.gz 120981974 BLAKE2B cbefc7b087c8df81ee093aeebff292c652dc29f37ee5bcf9ef891130c52bf93b3b735f1aa746fd1ec5e5e86c879d73ffa6f9df074f27b31799ef701206a7ea32 SHA512 bc6eb441f655f3b9cb13161fb731e592295a156e7d7bd0a38e4d3017bac90852d2ef64980c70889939ae082c9d1523af25d82ec2221415bbae0d01201d20ec57
+DIST llvm-rocm-ocl-3.3.0.tar.gz 115703174 BLAKE2B 4695f07317d625bb285470cc906489f22a5eb023b4337945c1d7b4237509d3481b9f9369611dc57f4e8daa8a70c7cdd8a9b0df4842cc1424e301a5366f458727 SHA512 896afa458c7527de469e6ee891b22be6ef351858c5d0c3da57bcd6d1d85667256b3ab3fe64167cc26536dbcfd95e1146edff9c24daf5e1c966195555748d9278
 EBUILD llvm-roc-2.10.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
 EBUILD llvm-roc-2.6.0-r1.ebuild 1380 BLAKE2B 76af5352a82861b2ee0d95f1d3d2d8025af747523f36ef847bb03e77aa8b4aa3932dda9f57d525265eb39cfaafa9e8a7c5fe3b106875bfd3090f5627e7d55c96 SHA512 4fbb8add4966a700e31e4774665b4a8a583b5fb2a09bdac395ed0ccd19b4726d36e7c84a0d3bc571e846abdd282f7cd8b06c50a127a5d31346b99c689adcdd45
 EBUILD llvm-roc-2.7.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
@@ -23,4 +24,5 @@ EBUILD llvm-roc-2.8.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e3
 EBUILD llvm-roc-2.9.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
 EBUILD llvm-roc-3.0.0.ebuild 1279 BLAKE2B 60660c178d5b92e46b877277552b4ba19d529949db56a5aa183d8dbe6686e9d5d51f6b69f0901670f9d6a87003d9650acd042d769b342b1c5066237e2c207327 SHA512 a5030ed80293ed444f5628d2148a49f239634e69913533813e71da0b61d3a876576cd13ce1bfc127d500e475c7961d8f9a6aca42a87589f6931fab028a3c7dc1
 EBUILD llvm-roc-3.1.0.ebuild 1286 BLAKE2B 9349a3432f62a8884ad2105cfd1e82b942239e69be369814447ae56a26b42f2893c915acdf020dabfb0c25df12f83bd52d81041ca1f58964f7328e01efbf4c8f SHA512 e9635742f05bb43a3aebf2b12c161c6beb18f727c9573fa7a32ccc39c7d977fe4a2c65e17e70ddb9699e89d5a5f10f301e8a984389eadb1aa431c72591d88c73
+EBUILD llvm-roc-3.3.0.ebuild 1289 BLAKE2B 569f17f1a4a97932a55e352a80fb6b8769809b1d05ecc52d25b262726382c68779dd2e2a2a4bea1c4b15bdafa36a0380dc99d6d3e250f79cf4f394ea4f83f75f SHA512 ec7822fc2774d905368c84c39bd9341f4df8706adf8c44afd26f9364d83ef0098d67d11b9075710c21355e60f6ca8470f3e6255db52b6e170342f3ae95350781
 MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
diff --git a/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild
new file mode 100644
index 000000000000..5282b7e0fe81
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-3.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-ocl-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="virtual/cblas
+	dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/llvm-project-rocm-ocl-${PV}/llvm"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-rocm-ocl-${PV}"
+	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="clang;lld"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7efb24dcf963..e07420b31a85 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,19 +1,18 @@
 AUX 7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
+DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7
 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.9999.ebuild 12262 BLAKE2B 4c2cb418ba17c7e92fbd91990f1cc12b0c42849900d4d7be882578b03c7b8c65395c0b761ebf6b44d86eb1851b1ff334f671699ff3abaa126c81ae1f9de3e296 SHA512 b1e3d900640356759707da22c8cecbe8f301cfd6280f2429d0692c6edcc354b60102605b6b5279ae0e0cfce27bf8616d6142ba0ee6878625c0da62c9797c1455
-EBUILD llvm-10.0.0_rc1.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
-EBUILD llvm-10.0.0_rc2.ebuild 11269 BLAKE2B 9ea7fc41afbb46fe885bbb3d101b3e3296ab03b4040f868d7db6e0b4576cbf6503a7364d67152e24b32d3b474d1d933820cc65643a03bed6d87357ceddada700 SHA512 386f00d33f8d552dbab6cc72e51b082823ae2e0fda2080e8291c534fb0a27a53f840e08c5225e4c395a04cf023c0e9280fdb00137521e19b7e2f68fad2791588
-EBUILD llvm-11.0.0.9999.ebuild 12273 BLAKE2B 3b240e2a4d621e586939a30132b3c7076f02dca4adf1e42664a1e7ff045363a3bd206bc2ba9156566ab02567cb283c40482989ae90b9bec8c9d29c036ca42667 SHA512 d96853ee6bb9c937ae61be56bedb9ee2f3ef7f6379e3e4fa07bb8e4d6c978dc67142a821e0921a74777f574089c0e06c7543986eada7b51c7f9cff1d91b982d6
-EBUILD llvm-7.1.0.ebuild 7719 BLAKE2B da35bbb89d699af2d78e31ed67b83efc28a8c06b93412472014fe2168421b3ab2ab9c59962641038c84ae1b73ccf77c6d4e5fff5671c82e5ba9aabf705965743 SHA512 3281422a2ebb63260069835e0855dbe34809479c2096f3340ccda1e3cb19cd8346a2f9eb8766bbaf2357f8fdf1ef3575475a6b33d6c92b4f130ded837b66439a
-EBUILD llvm-8.0.1.ebuild 8528 BLAKE2B 7b885e055ba8a3a4e54cb4c717290d085f8553f69819c33d6f1b878af132b1a97974b038784a52ea7f4d60f2e1ea912f8f65a5ede537c32025003179a78b0ffc SHA512 db97742c1ebdedfd986c890766e97b3cf0458f3b4f29e6294a48205f52c896cba0889144a380c8439a839f9b67a054b7dbd014995db8f9b46b847af54663de0e
-EBUILD llvm-9.0.1.ebuild 8560 BLAKE2B b63de028f5fa5da66234a02e5398347b7310c56e2cf9325aca8f0267dd04a3eabf8afa3f4b2580479e6b7afcbf7b3c010394e34a408f5fc892f2ca9250aee1bb SHA512 2060629c5abe6132e9557769876182a33e44352a19ed01e021e455279a2692ab8531028af586cfb72ee532210e840c0a3e0a3f9d1262f7471fe59d75cf1be314
+EBUILD llvm-10.0.0.9999.ebuild 12263 BLAKE2B 448f555d5cdb973560e10c84d0175189a442a56d81e1f33a7eba74bde2c0d8ffa071caa000d496a86deeb78d7dcdcb783759d50a1d61fb9c8ce262639baff3e2 SHA512 9286d7a5e1ce0d62161246b5dd5623f072cf4528e92d6413c25bd62fc8334eb477e5ece33bb31979a0a88220ffc89b77ebcc0be934872aec5ff2845f78748b8f
+EBUILD llvm-10.0.0.ebuild 10579 BLAKE2B 04be48351a56d46e4b13357415364c9d20a5e3e6438ca587a40f1233ffabaeeb14013a03e1794409a80cf9578bed03e93c82baae5ebe82fab7b4a9d141abaab4 SHA512 b4f6e58592423642bc570e57112b80a2c3b5abee66118333fff8bb06e5c7bb447b6636d73c304ab424d2caf842ef709db846aa8758eb7b72d0253e7e4b979b6d
+EBUILD llvm-11.0.0.9999.ebuild 12274 BLAKE2B a3bc762b5109dbf63bd8fb7dd17ac827b69bd607f6d45896adae613d5ad86900cb4006bce7c5c56aacbcc83902ba85c1880e1d17ec825571bfe7a62f19fb755a SHA512 0d8a3462a01f4d16e03b4e5571aba2dce693c19c0201eb7977755192f1cf57955fcb15d46e4cfe8e0d6421d339841d79742c940b3bf2e64ed5e4d37f1d71a93c
+EBUILD llvm-7.1.0.ebuild 7720 BLAKE2B 23728490c12b9ac68df0bc2aada3b1d2fc4339f2fbbfe1a50a8ed7b3506bf23eefefa558113afc4947d9ed8f1451ad20b73006b8dc2b93f41bda1882cdbc4293 SHA512 b2a9d76ce9877d2abf706cb09a2d62f63c07f89018cb74effb74a6a440e9f074d81a17c3e6f75d63c7584f376ea007b923255077075f3ac5abd300a723756803
+EBUILD llvm-8.0.1.ebuild 8529 BLAKE2B a7817e24915d008cede5b16c28b236f0b6fc8a4aa294a5f17c2910f6c74b91510a99e791388a114bc160802eede5d1792728265963190ffc11ca299b1e8700a7 SHA512 d5cb993b9feafe1b037f5a53c1faf361517614ab4d7a8ce061977e273fe5b38969a9f772e577a934367e224c8ba60b09bbcfa03098a604f127ff93fe1ff52c72
+EBUILD llvm-9.0.1.ebuild 8560 BLAKE2B c836408d0594b5ef706d18891582db39ccc2d0d900817f7520a282d12254891fdc593e153f97fe81c2c2767c7bf9affdb0c0f1bf926da2bbfa8b5077b4e4f10e SHA512 779017c6bda1c8d0902333a77a41bb52d3ec383a697dc9ce3b53de5b497262f0f41394c94fb70b2f560595e90280663804ccf1a36515163bf728c962d40038b6
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
index 6f27f3732183..f308f41ee444 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-10.0.0_rc2.ebuild b/sys-devel/llvm/llvm-10.0.0.ebuild
index 6c36096f80ac..c36aefaa55f3 100644
--- a/sys-devel/llvm/llvm-10.0.0_rc2.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.ebuild
@@ -7,8 +7,11 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
+MANPAGE_P=llvm-10.0.0-manpages
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
+SRC_URI="
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${MANPAGE_P}.tar.bz2 )"
 LLVM_COMPONENTS=( llvm )
 llvm.org_set_globals
 
@@ -28,7 +31,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
@@ -44,7 +47,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
@@ -81,59 +84,13 @@ python_check_deps() {
 	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
+src_unpack() {
+	llvm.org_src_unpack
+
+	if ! use doc; then
+		ebegin "Unpacking ${MANPAGE_P}.tar.bz2"
+		tar -xf "${DISTDIR}/${MANPAGE_P}.tar.bz2" || die
+		eend ${?}
 	fi
 }
 
@@ -390,8 +347,6 @@ multilib_src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
-
-	multilib_is_native_abi && check_distribution_components
 }
 
 multilib_src_compile() {
@@ -450,6 +405,13 @@ multilib_src_install_all() {
 		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
 	_EOF_
 
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/${MANPAGE_P}/llvm"/*.1
+	fi
+
 	docompress "/usr/lib/llvm/${SLOT}/share/man"
 }
 
diff --git a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild b/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
deleted file mode 100644
index 0382dba1d35a..000000000000
--- a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils llvm.org multilib-minimal multiprocessing \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/gnuconfig
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_live_ebuild() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-
-	# Verify that the live ebuild is up-to-date
-	check_live_ebuild
-}
-
-# Is LLVM being linked against libc++?
-is_libcxx_linked() {
-	local code='#include <ciso646>
-#if defined(_LIBCPP_VERSION)
-	HAVE_LIBCXX
-#endif
-'
-	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
-
-	[[ ${out} == *HAVE_LIBCXX* ]]
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwp
-			llvm-elfabi
-			llvm-exegesis
-			llvm-extract
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-lib
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-pdbutil
-			llvm-profdata
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-rtdyld
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-undname
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		use doc && out+=(
-			docs-dsymutil-man
-			docs-llvm-dwarfdump-man
-			docs-llvm-man
-			docs-llvm-html
-		)
-
-		use gold && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	if is_libcxx_linked; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		mycmakeargs+=(
-			-DLLVM_VERSION_SUFFIX="libcxx"
-		)
-	fi
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake-utils_src_make install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index 846d36f1235d..a2a27ccccee9 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-7.1.0.ebuild b/sys-devel/llvm/llvm-7.1.0.ebuild
index 7b91b533264a..6eec79c23a89 100644
--- a/sys-devel/llvm/llvm-7.1.0.ebuild
+++ b/sys-devel/llvm/llvm-7.1.0.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/llvm/llvm-8.0.1.ebuild b/sys-devel/llvm/llvm-8.0.1.ebuild
index f6a3fff2e650..9b844de0c502 100644
--- a/sys-devel/llvm/llvm-8.0.1.ebuild
+++ b/sys-devel/llvm/llvm-8.0.1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/llvm/llvm-9.0.1.ebuild b/sys-devel/llvm/llvm-9.0.1.ebuild
index 9bfbe3774a67..970b4af0dc1d 100644
--- a/sys-devel/llvm/llvm-9.0.1.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.ebuild
@@ -29,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
@@ -45,7 +45,7 @@ RDEPEND="
 		)
 	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	xar? ( app-arch/xar )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 8c9cdeb6b121..9c7602e6022c 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,6 +1,6 @@
-EBUILD llvmgold-10.ebuild 526 BLAKE2B ce096d5b2183692751d6453fd790f06d1ee679182da9aa8ddf0aae846f012b6bc837aa46a4439b575bd587088bcad9b3e8b6ea34f6e69e711ee9ace5b5dfa902 SHA512 842629ba1bf34fc6922c059f2bab674a4a6156d1420b83face9594ad521217c72a62df41abe5906456a495bf545201abd8d8ec93af8b3131ae33006809cdfd0d
+EBUILD llvmgold-10.ebuild 562 BLAKE2B 4dffabd911edce10c69037a8e12cf6fddd1588804993815982217913b30214d2654fbf8d597e4d0269ef7d9d3a89b27e1f5d9a1fb253847f2d1a63e17b590fd9 SHA512 eed54596a896f7796a5948a5897eed8e76be8d30c1a374e0cc9667b4cea56d455ab84a7b39d7388a12a352a4f03173544e804c3f86d48319dafbcd079feb0e9f
 EBUILD llvmgold-11.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
 EBUILD llvmgold-7.ebuild 558 BLAKE2B 29cf97eda879cd6819e35471dceca3fd5778f21a0d7d81706087ddd93c689978be667cd05b14c33c65222822b56a417e463e654cbd5f4cb7e1db03d1d3038cad SHA512 95a7672fa35f6b2a47ef25765a700c658086f8f83adb33e611308e8e3799ab51c7d0776419ba2065a3cd46a0f43297d61a6ab2b2de81e97ae09b388f266c35eb
 EBUILD llvmgold-8.ebuild 558 BLAKE2B 29cf97eda879cd6819e35471dceca3fd5778f21a0d7d81706087ddd93c689978be667cd05b14c33c65222822b56a417e463e654cbd5f4cb7e1db03d1d3038cad SHA512 95a7672fa35f6b2a47ef25765a700c658086f8f83adb33e611308e8e3799ab51c7d0776419ba2065a3cd46a0f43297d61a6ab2b2de81e97ae09b388f266c35eb
-EBUILD llvmgold-9.ebuild 559 BLAKE2B a71cf81d4a22aede0e59a34ee7eb94209450587effac1720e6d59d58fa46b0f237700d2f6d06672006a4c6e8703fd7efaf2c07fb1f2e8d3ad8cf5ad016ea1dcf SHA512 8958ecf264acce8a442711bfb574e9140a011475d8462a4c905dd1c3509c28f8613c997762f530e6756052aa1eb98681836f5ac8443c5d77d50cd3dca612702a
+EBUILD llvmgold-9.ebuild 558 BLAKE2B 3a5b92cb4e5896d0c6b9630641551c11f2bc02989b672260b62b4012b3378f8a019a967c47b1ea1646386722465f40daa1b3ae32a1b550417de33644a5ee21df SHA512 44dcb55061ce5f9cda007743d1d762761d431be90e78ea49db4da5412326d1766770ae5de5545c88785dcfb09966307d8437b0045b21d7cf25d447c7fe9b1c9f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvmgold/llvmgold-10.ebuild b/sys-devel/llvmgold/llvmgold-10.ebuild
index 8782f3aec17c..270c2c5f0728 100644
--- a/sys-devel/llvmgold/llvmgold-10.ebuild
+++ b/sys-devel/llvmgold/llvmgold-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-devel/llvmgold/llvmgold-9.ebuild b/sys-devel/llvmgold/llvmgold-9.ebuild
index 22358cc2bc26..5ee96cc29e07 100644
--- a/sys-devel/llvmgold/llvmgold-9.ebuild
+++ b/sys-devel/llvmgold/llvmgold-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 049481adb86e..93b53740b6e0 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -3,6 +3,6 @@ AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f
 AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46
 DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
-EBUILD m4-1.4.17.ebuild 1596 BLAKE2B d01647f3043bf18b33243c98989769efaf38d16f73a5770a704fcc565d514f5deff1014eefc4d650b4cd68bb9a8ebe6a03c4d111f8499ecbbf0dd04b27af1eae SHA512 5e51cc406db986598313fa9c20c693718a9f5bf394a445f5b48e909692c6fdda4dcd1669c688ea633cfe6eec31d7ab780414e18bf29d94f24d4c0fc1390449a5
-EBUILD m4-1.4.18-r1.ebuild 1408 BLAKE2B b90fd96a376e4f7a40759e70893669b96ffe2aeb404f2ccb25c156eb3f7d723c3413844f5b40af6bb7a0cd3e5831411958667537af5026b4fce9b67104e1eb61 SHA512 b3dee99aad72eccc0398eed7647f4de749e5ac81d3569b1f02394cd65a67ea7747099b96d32aafc578fe08e751955cf6a552691ded17ecfbba0c289a8b22907d
+EBUILD m4-1.4.17.ebuild 1594 BLAKE2B 953350d52d359c198138d1628d7aebb03f59b70dc9ac841d39b337b53f3afe4a3144858f962da7d921bd23aff906f618a2944173b1e3efae781ebffe1ce6f04f SHA512 92f787bf220cdae399671cc7c1b0fb65cb9d00013757b837cef2cc66ca647bab3b4a9bc232981617ae444dd2c9fa9cb283e413e912c607f7723fb99ef5a68618
+EBUILD m4-1.4.18-r1.ebuild 1406 BLAKE2B 7e15531b6c29936c7f796f389b6de6fbdb7c9563170b9250ef6baa788e95236afc197e915be36a0858188a920322539297046fcf227d02725bc29a7d23870b3e SHA512 9e09759cb8a2489d43a5a21baf60a7a682e04edfb65fc7b12a5dd6aa0fbf81cebd1234ee1a7f332f32d6a22e888dcdddf178ffefc053dc38d78c6defb8cc2c00
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
index f631b9bb5912..2de7157a5e9d 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild
index e66cc931ab40..1c6b4d4a3fcb 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 07efaafa8051..98bb15dc8ba6 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -7,6 +7,6 @@ AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360
 AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17e32bd0acd6cb553e34622945b2ea1c7cc6269b0c033fd60a7da19b80b80469e1340f33dfeedb42508e610dd5726c461bdf7d914 SHA512 39c83ee50cc2a5e8d30c77081e3c12e2848ba558bbbb3cc9eade7087a5514aaed13cdbb23caa7d4ab2047e62a65fc638622310b53faa4ff80b20daafb2e33d7c
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
-EBUILD make-4.2.1-r4.ebuild 1690 BLAKE2B a48f1011be44ae51d04ae51c6f92b47321a44717ef6c07b9f18fb0cc565f6f69d1652f92d5de60a6b4def85ca40e6ecc0c98f604a10a09865fe439e929ca14c6 SHA512 b56701446d0588a509acbaf8cb9ebb35735374d01afbf86fa717189121333b4fde8107ff70f15b795f2f96a02f0e5a098be684aef7a0087d6ff82aacf56ff3f4
-EBUILD make-4.3.ebuild 1455 BLAKE2B e39f12b3b251f445fc7bdc507e00714d570f4980031ddbfa4da2ae25a41c6aa54cfd9b2213a8fafe2b72b974cf5015253fb296c607a17e5745cec8d596a23970 SHA512 4b551e14b884e14913192145fb66378af0315409ff5756329cab3e94ef58ede65e7854c948a6cb88f25d501bdf4e82eab4b5fc360dc1fd19b2a8a6b6d4e7f4d9
+EBUILD make-4.2.1-r4.ebuild 1688 BLAKE2B 1b673073ea36f10db26494e51038f2dd24c4fc7dd6f8a110632b4d4970086db7c9423de1056d0a3962f6fcbe5bbd5fa50ad8cf0c9795d9ddbebbdc540b3ffd5e SHA512 ae230342349737f732d3cdae6380664e1090a2367dd31651a51a13bb825c890de9d457c890d34df6c948d4322fbdd592a0afb6f8e75017ec6420008c076b90b1
+EBUILD make-4.3.ebuild 1451 BLAKE2B 89bd23b716efd63a8ef599bfe477f635fb588b10f3cef1560d2e3395f832efb4fd2963969ec977d7f31c0ad5b18fefe2866b11cdf85911ad6bb10015ac8f0c5c SHA512 dd0c9fffe1aeb67ff0aecdd67a55ae3b1f40942529e0a393ac603aafca7d36ce236228837899dd9a5605e75585dc9c5e31ac1e4dd5cd1cf70a3540fe9f06820e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild
index 9b1456665f07..b6d687d03441 100644
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index e15a331d2423..08f05795abe4 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 20064141035a..74da0aa1099e 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,2 +1,4 @@
-EBUILD parity-9999.ebuild 1760 BLAKE2B c62864c0e71a39c4377f42d1ca9d48de76f067cce8d5366b7856425e330e507bd8897903ab1a513a4eed73323ca1f08aa2f62ff1d62fe0224c88d700c90569b9 SHA512 6d861a309dd629d75f8ccb46b3b79dc6f32587e5dc49dc7b241b4d0049aaedecc22185f4c30df93cfe519c56411115679cdbb6a648a23572fbdae806b72bf704
-MISC metadata.xml 1163 BLAKE2B 72a30d918efe5f179d9bdad8accb6a59ddee5bc65c025c2e9b8db3c2eed8a94bd99438609db8a28cca06cabbdde1e52615870384276735855612bd58f0e2ceb8 SHA512 1cb4c0a6fa98ceaf9da3ff73e959fcbc17a1b9a870610f4bc50c0729f5c2560ca9f1753934573dc47b1fe1c4ae98ca7c4dacd5ea99cce6e18c4d97141eda851c
+DIST parity-2.0.1.tar.bz2 371662 BLAKE2B c0fca272665bbe346d5d5ca18e06c65209df61454310811b939239f8ba25ec7a08ad2f864fb43780329dc1f0120afdb6ea4ee2b4b42d2888860358aa1dc176f4 SHA512 3c96c87b87f40cb7affd6ee9a87c8e7cf628aedb44a2d3d89370a5b5e32a43cb15a897ae27425e9d6a00581ffd50a70c7a7481f1ca259eddd1e6f2310b554eb9
+EBUILD parity-2.0.1.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
+EBUILD parity-9999.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
+MISC metadata.xml 1029 BLAKE2B 82474429a3a04609f1f1c899a235a759a2f66982d5bb7310ac51b1eea803fbb102cada8c197b14a89b66619c80ac9d1f5beefe607257c3e2c0de390e84aa3fab SHA512 d40f330e336dc0166e3666bab44b6aadb723b0cbdb0a7b47a2d292320e02649c075f28436de622b65280cf024b3f57a8945d7123ff520c4d76e0c910bcafc77a
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index 40c8b82ed8b6..b66b8d4e0b7e 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -9,8 +9,6 @@
 		<remote-id type="github">haubi/parity</remote-id>
 	</upstream>
 	<use>
-		<flag name="vc7_0">Enable support for Visual Studio 2002</flag>
-		<flag name="vc7_1">Enable support for Visual Studio 2003</flag>
 		<flag name="vc8_0">Enable support for Visual Studio 2005</flag>
 		<flag name="vc9_0">Enable support for Visual Studio 2008</flag>
 		<flag name="vc10_0">Enable support for Visual Studio 2010</flag>
@@ -19,7 +17,7 @@
 		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
 		<flag name="vc15">Enable support for Visual Studio 2017</flag>
 		<flag name="vc16">Enable support for Visual Studio 2019</flag>
-		<flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag>
-		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
+		<flag name="vcx64">Enable support for 64bit Visual Studio compilers</flag>
+		<flag name="vcx86">Enable support for 32bit Visual Studio compilers</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/parity/parity-2.0.1.ebuild b/sys-devel/parity/parity-2.0.1.ebuild
new file mode 100644
index 000000000000..7f41d7bf06e6
--- /dev/null
+++ b/sys-devel/parity/parity-2.0.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git@github.com:haubi/parity.git https://github.com/haubi/parity.git"
+	BDEPEND="dev-util/confix"
+else
+	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~x64-cygwin"
+fi
+DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
+HOMEPAGE="https://github.com/mduft/parity"
+
+parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
+parity-vcvers-legacy() { echo 8_0 9_0 ; }
+parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
+parity-vcvers() {
+	parity-vcvers-legacy
+	parity-vcvers-current
+}
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="$(
+	for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done
+	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
+	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
+)"
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		default
+		confix --output || die
+		eautoreconf
+	}
+fi
+
+parity-enabled-vcarchs() {
+	local enabled= a
+	for a in $(parity-vcarchs) ; do
+		if use vc${a%=*} ; then
+			enabled+=",${a#*=}"
+		fi
+	done
+	echo ${enabled#,}
+}
+
+parity-enabled-vcvers() {
+	local enabled= v
+	for v in $(parity-vcvers) ; do
+		if use vc${v} ; then
+			enabled+=",${v/_/.}"
+		fi
+	done
+	echo ${enabled#,}
+}
+
+src_configure() {
+	local myconf=(
+		--enable-msvc-archs="$(parity-enabled-vcarchs)"
+		--enable-msvc-versions="$(parity-enabled-vcvers)"
+		--disable-default-msvc-version
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	if [[ -n ${ROOT} ]] ; then
+		einfo "To enable all available MSVC versions, on the target machine please run:"
+		einfo " '${EPREFIX}/usr/bin/parity-setup' --enable-all"
+	else
+		"${EPREFIX}"/usr/bin/parity-setup --enable-all
+	fi
+}
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index f1ec325bab1f..7f41d7bf06e6 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git@github.com:haubi/parity.git https://github.com/haubi/parity.git"
-	DEPEND="dev-util/confix"
+	BDEPEND="dev-util/confix"
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS=""
+	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~x64-cygwin"
 fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="https://github.com/haubi/parity"
+HOMEPAGE="https://github.com/mduft/parity"
 
-parity-vcarchs() { echo x64 x86 ; }
-parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; }
+parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
+parity-vcvers-legacy() { echo 8_0 9_0 ; }
 parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
 parity-vcvers() {
 	parity-vcvers-legacy
@@ -25,7 +25,7 @@ parity-vcvers() {
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="$(
-	for a in $(parity-vcarchs); do echo "+vc_${a}"; done
+	for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done
 	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
 	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
 )"
@@ -41,8 +41,8 @@ fi
 parity-enabled-vcarchs() {
 	local enabled= a
 	for a in $(parity-vcarchs) ; do
-		if use vc_${a} ; then
-			enabled+=",${a}"
+		if use vc${a%=*} ; then
+			enabled+=",${a#*=}"
 		fi
 	done
 	echo ${enabled#,}
@@ -68,7 +68,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ -n ${ROOT%/} ]] ; then
+	if [[ -n ${ROOT} ]] ; then
 		einfo "To enable all available MSVC versions, on the target machine please run:"
 		einfo " '${EPREFIX}/usr/bin/parity-setup' --enable-all"
 	else
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 1c3f827e867d..b0a6142b8b74 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -11,5 +11,5 @@ AUX patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch 860 B
 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382
 AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
-EBUILD patch-2.7.6-r4.ebuild 1685 BLAKE2B ca98d02273a3e746ad11e2254e8b8c29e91d656d52cf7b2b610f512bb8bd6a15c72a026d035786bc22ce60437cc8597165b6285e1a9416c058c24e5acd549e78 SHA512 0d78493954446fec9cf5e93e8520508d6673bb7ea97dd3d1612ab6e6a00a6b0cc3de13e8273e4db0e0d5939362b03ce9af2321d202378e0f0af8e700cb1ff4ee
+EBUILD patch-2.7.6-r4.ebuild 1683 BLAKE2B c467102af78e114ac24c50ce0585c8b77443ecce7e05954d8b18482c7afaed34ef448a0d451f70844ea36c0f8ff5ec321660ec2e9e259851f2693afae7aea270 SHA512 71c6bf1b07edd0ee9a53865004014eac6be0dd404cc33f64107ce92fc7b957b13fa51030e9b4084b164cb0a74de70d8bbaf2115f393912f5d60a6c458dfb7edf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index ed5ef83af673..13583e5ebc86 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 92d6a2a1a239..f6ae4aa2e789 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -2,5 +2,5 @@ AUX pmake-1.111.1-ldflags.patch 484 BLAKE2B d94f955c6ec149b7617c26010e7364fe2ad5
 AUX pmake-1.98-skipdots.patch 513 BLAKE2B 03f63f698b3d147dc0d1df0140f40657cecd445d7c7659f18369e5fa541b0370ced4cddafd27639149aa93053440f7d43b715baf1893cf4613ba15fe6820bdc9 SHA512 ccd751cca406abdb763f251c147f7b7efd7b001e415bc8c98a4fa8069420b64c3a5819b4abd5f174606390f903f8cba5e560e02a14519619713da26ab52c54ad
 DIST pmake_1.111-3.3.debian.tar.gz 31648 BLAKE2B 31aca433bbeac4275d4c2af0cfd33ef81b0086b0dec107edfc1fba55b15480367ebf62abccd6e2e48f0c7ccc25c59f0b07eed7ac950a5037b73c267b066a9638 SHA512 b22a1d9e371712732f196d91ac3eb9239fa98ee8ee05754576e7a5878cab88976cb10bb6be90706df5ac738373f519468403c23f6a3ff3860a2968b3222a66ed
 DIST pmake_1.111.orig.tar.gz 264383 BLAKE2B 54dd510251441b54c9f5d7f6061109b0222191b3acdded1394b51b72b87bbd4255edd80fab46976d92c58929693b6809a9f2c4f001cab8c9cdaabfac9f3adac9 SHA512 ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22
-EBUILD pmake-1.111.3.3.ebuild 2377 BLAKE2B d18db3a355cfa1e6493ea41c0f203b3f60b7300747129b2afc6738a45bdfabda743b093edbd387485efc91d5edebedced43b9e7139a913d1a4f14418fb0c8bc5 SHA512 64ef6fed4d60d2cf596af1663421d97e5da17cfc83158ea563c28c598a08adc97cd2cd07cbaf7f63bb0bc5ec381b2a7732fcd413d33c820c4e421f012fcb0968
+EBUILD pmake-1.111.3.3.ebuild 2378 BLAKE2B a56d9ec5d5e08350eee2b0bee423ccc9d5ff2ef8f05945feee652f41e84b13d9e18fa22944e8458a2d32ebd2c8c28887505d9a477b79ddb0a806c2fcfd395c9b SHA512 42ddfaf022aec438bf7cf5c4f277ead8121e31248c764778cfac5c693777906de6805e3b1bd0e5d4fda063017ce4ee421932a89af3e7e6a6b2b7ef212af66f04
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3.ebuild
index 75741295799d..2ef5424fa653 100644
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 58eecd233669..495ad1c9c588 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -3,11 +3,8 @@ AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296
 AUX prelink-armhf-dynamic-linker.patch 519 BLAKE2B 1cc1790256e9c9cfedccb200dbcfcacd61e6dfe5165c9703a1ccd098c0e5b07c4053b9da6a46a309242347e27478ab47b12c95bf3b9e83e6e6f19e118b97669b SHA512 af898440f11af102d6d4b95ade2ed267dc5e3e01407ded17ca2df7454ee845f8177c0316e9bc73838f3965f5000f58ac51055588fdb4a90293cc431e07e9e467
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
 AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
-DIST prelink-20130503.tar.bz2 928040 BLAKE2B cb0e6fbff85b57c8698f22750377461e127bf89f6d03e6fab2338cc50dc280036ab5d1f56b0e8eed5ebaf391f8e3e0d3c32d9df6499fa17e2e556656ba13966d SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
-EBUILD prelink-20130503-r1.ebuild 2458 BLAKE2B 27df684421d5857a5727916bbcdbadca5d9e8847a1f8c0abafb892fc6af029932687c0819013416d36ad0182bf771ed89e238a8122cc83631b6cc5717ade8563 SHA512 2cc0e66fb48f2137bc9a8118d1ed97e58dd5725bd30b042c4276dad5df2d65ef8298e93cdaeb0b8b292c16ff255fa1ddacdc104150ac478e1bf8677869ce4939
-EBUILD prelink-20130503.ebuild 2617 BLAKE2B 24308a12628eadef19728c07f6a2be21671e2119d6570fd7d2fe8cb7805a041edf4bb54cdc391b808d396e2585e54fbd0c2f46fe755ab35722bfcfd2690fa7c1 SHA512 4ba50aad1ba5e142f8a0c96d2ab73fca49712202c506a57af58e9fee5021446e6587f9715420244c39aef9f006baf8cfef7cd318e8e6e21f36aa590f7840cbc0
-EBUILD prelink-20151030.ebuild 1730 BLAKE2B e26489b2564da3cf789085fbeee5094063dcb1d7293814acd510eb205a72bf07326d20a99bb6029e57b03c5db8a51519cac256d2baa318b89019413024d5912c SHA512 78e3c0e728ef3175c558c0137511e8d3c1e83977d1307868bab73ec1e7c4825147d6687f43478ab64b51aca829a92d0e33aacf68d5051b7176817b69f91950b1
-EBUILD prelink-99999999.ebuild 1585 BLAKE2B 37746d0631d4a07c94f9ad71cc00512b4c485ce13b00ca84263be41f0e8a1b00a315764a845740fe3cee30cdd5acb7d87d41fc0be2d764a158fda62bcabc4df5 SHA512 5d844567440de565d363cff958b3027ce5a7e80a68e46dc2c10e2176bf2306788d4c2d86d6a92a83324a6264e6c374d8d48a38665535588c4b71ac07a03d7a5e
+EBUILD prelink-20151030.ebuild 1651 BLAKE2B c4ffd87d6c0d8647a49b7f1dc2920b7c9ed261251b4f51c426b413af6720d8d824b2f1aca958e96b0cf68644c135d4004551639ac14b57d99fc701601dc1f50f SHA512 649e734c2133dc736af08ff60fc580fffd52ea0b5a9b9d6dabdb5a2d68acbdd3e73cacbccfcfff5d84e2eb9a4c531293b3ebfe4921d5e4de71cf0ce6bfd5ab36
+EBUILD prelink-99999999.ebuild 1505 BLAKE2B 818c487e68c6a6b8d4419e802f101a02a99bbd666005ec94745fff3242892d7e742aa5e781b89cbf95f9a35b6f043e876f0fceeaad383a3fe69a2b9a910c555a SHA512 c027960bfe1ca7efb0479024fbae2c5fe231d14c48763b11332a1f0b4c3dabc4c9c75ba616723fab6d0ef6419f95fd2b146684fcd8f4ca713304747f2dcf297d
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-20130503-r1.ebuild b/sys-devel/prelink/prelink-20130503-r1.ebuild
deleted file mode 100644
index 5f8f8e9f70d4..000000000000
--- a/sys-devel/prelink/prelink-20130503-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/p/prelink-[ver].src.rpm
-#
-# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86"
-IUSE="selinux"
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
-	epatch "${FILESDIR}"/${PN}-armhf-dynamic-linker.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:CCLINK="$(CC):& -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:CXXLINK="$(CXX):& -Wl,--add-needed :' \
-		testsuite/Makefile.am
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf # prevent maintainer mode
-
-	# have to do this after eautoreconf or automake barfs on the trailing
-	# backslash of the previous line
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-
-	export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Prelink"
-		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	fi
-}
diff --git a/sys-devel/prelink/prelink-20130503.ebuild b/sys-devel/prelink/prelink-20130503.ebuild
deleted file mode 100644
index 46b2197ba6ed..000000000000
--- a/sys-devel/prelink/prelink-20130503.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/p/prelink-[ver].src.rpm
-#
-# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 x86"
-IUSE="selinux"
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
-	epatch "${FILESDIR}"/${PN}-armhf-dynamic-linker.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:CCLINK="$(CC):& -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:CXXLINK="$(CXX):& -Wl,--add-needed :' \
-		testsuite/Makefile.am
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf # prevent maintainer mode
-
-	# have to do this after eautoreconf or automake barfs on the trailing
-	# backslash of the previous line
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-
-	export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${ED}"/var/lib/misc/prelink.{full,quick,force}
-	touch "${ED}"/var/log/prelink.log
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Prelink"
-		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	fi
-	touch "${EROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
index ff8cc4445742..e119ab02ea93 100644
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ b/sys-devel/prelink/prelink-20151030.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 MY_PN="${PN}-cross"
 MY_P="${MY_PN}-${PV}"
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
 HOMEPAGE="https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink"
@@ -18,19 +18,21 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc selinux"
 
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	sys-libs/binutils-libs
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
+RDEPEND=">=dev-libs/elfutils-0.100
+	selinux? ( sys-libs/libselinux )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch
+	"${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
+	default
 
 	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
 
diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
index 390d0c35e0cd..4088e323d9bc 100644
--- a/sys-devel/prelink/prelink-99999999.ebuild
+++ b/sys-devel/prelink/prelink-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,13 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc selinux"
 
-DEPEND="selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	sys-libs/binutils-libs
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18
-	>=dev-libs/elfutils-0.100[static-libs(+)]"
+RDEPEND=">=dev-libs/elfutils-0.100
+	selinux? ( sys-libs/libselinux )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index 01246e840903..a218ccc38f3a 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,5 +1,7 @@
 DIST qconf-2.3.tar.xz 51848 BLAKE2B 836f22e50cd4c9bb2beefd85d0e5f85f7aee40078dd4a696492c344ae9dffeae20840025a3262b5abcc2c74b22ed9e0bd4b44d077b83ab1e904c0a93bde394ff SHA512 27a532cb52067707a3e04a40260bb0f42e40adff4a643d2f048832356de58271e4051c9cb810e6fffd4b4e45dba483ed65aec062506053caa262ac03b3ec6253
 DIST qconf-2.4.tar.xz 51880 BLAKE2B c87a2a6dbca56fa52bccd0cdbbdba64013adcbf03c6cca6744d3e1c3166f74a09e945022854b1143e0c08a70a6124c0b890be8d7f9d4a91be7c6c0e2c89bf800 SHA512 982ace9e1d30f6c92078d661e103418fc7e3352a56eb78dae64a004e563f5e7bbf8f71972ca482e2f5229a6f88bb51372e543833f99c4b596d0ae4be5f443317
+DIST qconf-2.5.tar.gz 100704 BLAKE2B 01dcca053e020cfc76e8595927dd3cedb6c82ade24381c95935c87994037ca5129f5e9e0ec58dd0e0fc6815b1500249b767367fbf7a16549459f814bb1591368 SHA512 4ce032eb5b9ba2d584807b3283b0dd5cf973c2fdd6792dfec13c54bb7c639d23eeaab03eb52f1a395113d973d2b01d87bf713d717e691641203865b934c7da5e
 EBUILD qconf-2.3.ebuild 816 BLAKE2B d9b6098f799e41e2626e8dd4c30b63d615700f5b27a1c16e3aaf5c3f0f37082b96dcb311c0aaf73649ae06f72c695325dfc8352dfce08fb4c7945656bdbadd14 SHA512 965c0f48f3de3c2947736248e48988365c4b48e76f519c4d5de7f8a51baa62e5ca421a9fe012a51732e29f8552414e891ece6ec939393a2e8127ee4f476e142b
 EBUILD qconf-2.4.ebuild 839 BLAKE2B 93d7b63e9fab27f6bdb5f30822c779056d156451042d88b0094970444880cac770c34f5dd621e0a482b813cd8f27e16ef45869ff91eb1537c19e7b9a7dfd6f44 SHA512 121992c1f91042092767f00c2e695918015d792e071ca135ae5d5675411ccbd70a56d35cea703b0439b4067517adbe4dbf5103684d2fe090fd4a8166b830915c
+EBUILD qconf-2.5.ebuild 833 BLAKE2B acb2e1a96f77f977b977c1311f0c67caa53f7fc1e911d4a9d5caeba6e54d7822e9c267213008d3bf987707d3b78c9d44522a44db2da04effb603c1a9e54b919d SHA512 ba5fb8f3b03e1e74efb81c1ebbeec82cf937a5f62e1c002212aa42b8e90f774e2a588b23c518366b404d8f86c2a7c5b75a7e818e5fb60e2f84b5f9451a618b7e
 MISC metadata.xml 520 BLAKE2B f9a6c120d33a273ac1bd1d2be0b6af7eeddba959966af10812136a282acf423c17e14f5727dbd8a6cfad84f977e32695df43ae5bc9b13bffdd398b0ca27cd596 SHA512 d707a3c441702da2b0c4a6313acc4441fbd75e0b02990c9556a4d13906a8383683c261dc92a5c6f6a3593fd6d24761ea246110dd4514b4a7249bd6eda19b19cb
diff --git a/sys-devel/qconf/qconf-2.5.ebuild b/sys-devel/qconf/qconf-2.5.ebuild
new file mode 100644
index 000000000000..0064bce46584
--- /dev/null
+++ b/sys-devel/qconf/qconf-2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="./configure like generator for qmake-based projects"
+HOMEPAGE="https://github.com/psi-im/qconf"
+SRC_URI="https://github.com/psi-im/qconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# not autotools configure, so don't use econf
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--qtdir="$(qt5_get_libdir)/qt5" \
+		--extraconf=QMAKE_STRIP= \
+		--verbose || die "configure failed"
+
+	# just to set all the Gentoo toolchain flags
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	dodoc -r examples
+}
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index d0d036480cbb..174af9cb0f30 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,4 +1,4 @@
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
 DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1
-EBUILD remake-4.2.1.1.4-r1.ebuild 926 BLAKE2B 7c60c017b473982373f252f49e50bac2fb124af42383f833e14292e1816060f62d2105f29cba669123a264005c8c0097ccdf47bf9d379cd142bd2e92cdc14de6 SHA512 81fad3dcfc5e6a98d930fd36e81b5f17a4c144d88475e0cd9d135baad7a7b297e2ad224b653b0d6c71a7cc218477fb7d3e20a15a445edbfc36ca9cf6f258fb53
+EBUILD remake-4.2.1.1.4-r1.ebuild 922 BLAKE2B 8ab9739649111df005ed43060f46fc58788bb420861405f271cd9a81cd4c3508abb6175f314cbab9db184659f6499f1946915a5bdc27f4529dbf33cf64c2314f SHA512 fd5b4d212289a0dfff25967955a31e973fbf4cb013e8981da032c880ab3381b6770549540312feeaf4d10df4e621ca8a02d546f344a23de9d124fb2a0fc29508
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
index 41c678407557..16971ea81794 100644
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="guile readline"
 
 RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index f26d65e2a4aa..7370e2ef6f06 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,4 +1,4 @@
 DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
-EBUILD smatch-1.60.ebuild 1250 BLAKE2B 1960cd8b368c13439e4b180c5440e4f38775e4580360b01c498a4f793facc8a695871f22833d25a578dd33761f577723d75e9d4c0129c87945f176a8001dd69c SHA512 829f80b6695883eece120429735f3021f8f0e8a808ee8ae4e3018faa72b0147ae999f3892dce7252dc228d4d6eddefa7d7783d6418b5abdfa18be9e264500873
-EBUILD smatch-9999.ebuild 1195 BLAKE2B a7ccccf1b37a9cd03a0b9d5d0308d842c41b162e84eb2c70843fe74abf320ebdca2d517153079910c9b91e87a9156b115b5daf23a74713516dc0f7040507285c SHA512 3e47cbad0a9ac2d6b9775866ff6bef56aaf94b305c9132837bbf23629b960a339946732f76fff3aa1a1c88ffff0571e7d7cce422fe797797c04e548cfca89a7c
+EBUILD smatch-1.60.ebuild 1246 BLAKE2B 40dcc418dcab2cc9de15bedd0ec6d1f183248775183f01a07be9a6988e36213729c66d14c2b75a39df9070e388a3b87d806b555a8523523328dafaf18bbad04e SHA512 c025bfcbc4976575e3c219d3bf2a35baeddfdf26f62df2946f93e5564640717926d793ec45f8a8df2ae7dfa3849e77a0ce0c4df93c9886f51ce87264d642cafa
+EBUILD smatch-9999.ebuild 1191 BLAKE2B d9baf17c05efa271ecb09973237297864ebc0ab937c45005874f6e8e51ccebd8ab4526cc2defa89a17c0caf6db75fa9ff764a61f473ce56f37a55d2e7c8fce46 SHA512 a99c4ddf4d17f2d5aa019a87d7151d71fdd7719f406cfd1df09f76a21bd6d8a534969bcabde50579e3d2f52b87ff5e8fda331ee0097ed525cd648845e4806962
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild
index ad8cb5990563..e8505ae64d23 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 7d4f2ee58971..4e3cca48e997 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 762d6a2320a8..9284e33b4454 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -3,9 +3,9 @@ DIST sparse-0.5.1.tar.xz 215144 BLAKE2B 209aa7cf34a9135dae38466a0ba41ff4fb888c36
 DIST sparse-0.5.2-rc1.tar.gz 282810 BLAKE2B 74d06230ceb06dac427984c365223633ef795b2f6329c69da5183b9f3444457ee05d74b04b18cf400b4d813026a746218edbf9bc0b2aa371c8a3681ac10ce19b SHA512 b58458b97e91b7d02d032a946d9870a3fd227959608fb7847864ad1a92258aeb0461da513f4d6d3b37791ed8d5fc41ac01cfef0fcaf34b229090ff078672ef40
 DIST sparse-0.6.0.tar.xz 284668 BLAKE2B 9bb568fe23ac96d6e179e5c5927ff34e9fc88909d367f6ab49c8862a8e599df83602ba72bc42ba3bf63823b024340f101128c528ebf767f4e29da7f5324a1f40 SHA512 5c6c88f203c941bf0efd28802ef91641c96e7d4b4688a5176d091ff0fd6a650d9147e590b631602a8bd08994a35261977569367861a6d605ccdd25e4a07debf9
 DIST sparse-0.6.1.tar.xz 287880 BLAKE2B 026e7770460ab576b91e8c401c642e95269ddd7c90c0f855b0246448ca653b95a899b4bf647134c090c06c802757b6415dcc89bc214fb7ff124c2ce3888fccb0 SHA512 2faad9b3263f19f941cd6a5891960d2c7d1066c664d3ef68e722d461785aeed2d4a9539df3556bbd98c022e7ee965b8030c49272ab6003113ba3b36f73c00187
-EBUILD sparse-0.5.1.ebuild 1327 BLAKE2B c44384e5b672e5e83bee23d70c2b3b0fe31c6f399c3f40959416f38db7462876f3f969c80d21242dc5d795fc8f183f09b5fec500adb5b2e56b8d121accc69c35 SHA512 d47842a5115e1b92c16b69ff12e42e1b9373610a04aacf6fec6d41c4062fbd3d4f72e351f5265e82e25e14f665174fd98e0f082649a64566e15e084f432f4c84
-EBUILD sparse-0.5.2_rc1.ebuild 1403 BLAKE2B d2831df966b03a8fe9d1c2fa76a13e8157fa5c6450e55620d6076a9ea9babd7a5dd20ea1d27ee124c4a7aaefa0d255f0ba8e8de2442a0e549e65e84ac804380f SHA512 63463d63f25beb72ce5629c2edff0cfe06f910cdefcd49f5b28a6afc7c9d1ca5f2b0977d07a048071eea9ae5462da68eef6e3412dcafa334800d9e0ad84fb126
-EBUILD sparse-0.6.0.ebuild 1296 BLAKE2B 5ba61e5e9e8a1bcad1b11df3f8707555c4cb15bfea192c7b4192a0bd78e0ae3b38fdadb3aa96958b795e57bcbd4feb74c5fc467c01f7fa638d608cf33b8ce23c SHA512 35eb90b9d6316a7d19a64be1043658dcbcdebee0127aa3e82bb7a8ad46544b69700688eaf4a20a6082ac2be3ad77a67cf20034e023bd24d0a9a58aa3d62e5aab
-EBUILD sparse-0.6.1.ebuild 1330 BLAKE2B 3a12192b45f930ee4dd2a5f0c9dd3fe6aa506e2eb646cd1a5f543f7bdc805093be2567b43f79df3df713d75f00fe2bdc7157b308880aff5c472dabfc676f36cd SHA512 678d576cbe52849aa76e399837d8b9be37bfccbbd037a4282bcb3fdd7b182161780cd2f61d186d954d617b7d4d0dd505f29209073662c2d9fec6d0869d003ac8
-EBUILD sparse-9999.ebuild 1330 BLAKE2B 3a12192b45f930ee4dd2a5f0c9dd3fe6aa506e2eb646cd1a5f543f7bdc805093be2567b43f79df3df713d75f00fe2bdc7157b308880aff5c472dabfc676f36cd SHA512 678d576cbe52849aa76e399837d8b9be37bfccbbd037a4282bcb3fdd7b182161780cd2f61d186d954d617b7d4d0dd505f29209073662c2d9fec6d0869d003ac8
+EBUILD sparse-0.5.1.ebuild 1323 BLAKE2B e24dd33f50cb9e5154a863eac43f4f03cf64075cc8e3462f9dbc4aacf7ab33985ec3388f750c355da66002477964e3a6ac3f6268195e46624c1f615dbd81480b SHA512 3f7c50f64665b199ecf899a2e209489a6c39f1273056d339447401e76e5422e82f9f4001424afef99b4d980bd585c21b92ce36619e8ae5cff7357937250521b4
+EBUILD sparse-0.5.2_rc1.ebuild 1399 BLAKE2B 4e0b4d000c0ac935a0f82435505e1c3fa372862c8628716c47d1d726593d2c919fd3807d8c2bc2cb81832cb044b34a39f308acf4c04ad5302ca4126b5a832ab5 SHA512 cc5b9242a8c205356f27cada0f51d5eacb3bf57d006c83fcd42e83ebee05a4da5f10d4e7fb56261c0d279aad68f8db49da07edaf76b99b0d3fb77bf9a0de2eb1
+EBUILD sparse-0.6.0.ebuild 1292 BLAKE2B 57298d8d8db6492498d7c6743e9d5c1c025754956c5b4317cdb3ab89daf06d675b69f9eddc03ffe58e8b14e857672ac37c043ddf4d6e1ef5e1f051e24f88d22d SHA512 b5fe4638421606863f721ecb2fa6121d8008f00fad23f2d0bcfb67aad5af0fea060fc63258d88795770a06deb663adec2805af649ef98077686dbb431a529936
+EBUILD sparse-0.6.1.ebuild 1371 BLAKE2B 1cb48cddc186f3ab6726c5d7d6f4dcd680e44856626abe1cf1df61c4dbaa65f1bb821422533ec37e658be1330605cfb22f72461a7378dd7e561359c5c454f047 SHA512 cd3ac75ad44361a400cc659fe4e6b40da0bd10db5ec2e9cc96811d11002bfede6e345888cf662dac6963b9f7713b7068cefac19aee412cde699250770d9226e5
+EBUILD sparse-9999.ebuild 1371 BLAKE2B 1cb48cddc186f3ab6726c5d7d6f4dcd680e44856626abe1cf1df61c4dbaa65f1bb821422533ec37e658be1330605cfb22f72461a7378dd7e561359c5c454f047 SHA512 cd3ac75ad44361a400cc659fe4e6b40da0bd10db5ec2e9cc96811d11002bfede6e345888cf662dac6963b9f7713b7068cefac19aee412cde699250770d9226e5
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.5.1.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild
index 42e03465b179..45819e268860 100644
--- a/sys-devel/sparse/sparse-0.5.1.ebuild
+++ b/sys-devel/sparse/sparse-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild b/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
index 345c634dc184..ad1d45931133 100644
--- a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
+++ b/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${PN}-${RC_COMMIT}.tar.gz -> ${PN}-${PV/_/-}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
index fa4c7a97fab9..1b776ebd0a15 100644
--- a/sys-devel/sparse/sparse-0.6.0.ebuild
+++ b/sys-devel/sparse/sparse-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.6.1.ebuild b/sys-devel/sparse/sparse-0.6.1.ebuild
index 8df52ef8a1e5..d058d2c9ea40 100644
--- a/sys-devel/sparse/sparse-0.6.1.ebuild
+++ b/sys-devel/sparse/sparse-0.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+}
+
 _emake() {
 	# Makefile does not allow for an easy override of flags.
 	# Collect them here and override default phases.
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 8df52ef8a1e5..d058d2c9ea40 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+}
+
 _emake() {
 	# Makefile does not allow for an easy override of flags.
 	# Collect them here and override default phases.
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-devel
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)