gentoo resync : 13.10.2019

211 files changed, 1242 insertions, 1293 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9589f88ca707..a4ab35377bff 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 6833ab2e5c14..146f19a71dac 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 725 BLAKE2B a0b61eace8f6ceb2780ed644aaf087521dcd9cb65449523242691906e6ee2cb2408e9d728a557d6c93db238152432f86c0e888c161ae9d216c813bb8b6b9795c SHA512 847e2eb96fb424f5ca363f1621e29b9545c9a413ae2bfa98de829a0f26c37654d869d5d4463494afa863cdf98ec7e20422371f467f7b3ee95d676fbbd8b6892e
-EBUILD autoconf-archive-2019.01.06.ebuild 680 BLAKE2B 8753a185b9f3b908768e0306e03752369b0270157c78803159c4045270b3e8dab5e89bc03c00845cc9929b7ed89a4df9d859aa7496de633dad669299f6e250df SHA512 ceab2a04f4fb756b94ed8f8a1c69247d07ee3094d2126e3f5ffb2d39048ab21acf4095863575eeda870961afb1db19c5befdffeac973849f40a97cda355611e1
+EBUILD autoconf-archive-2018.03.13.ebuild 714 BLAKE2B b9d3db09b092c502190c6ba73523d020841c14daf9256d1a82a6e1e90ea6bac1b55ac366be855facd13ab438b2f1217e7b0dfe6bfa3ac7e28f436ce51e564260 SHA512 d6d2ff6ef40cd6ba9943c2cfa9246803d689333797b71316a90ed9255a6bf4ec6203f1016c5c0e9c4efa48c10ff71dd1a4e9ca529250e779ab68303ab74cc59f
+EBUILD autoconf-archive-2019.01.06.ebuild 668 BLAKE2B 0c88f48c347fc88438d5048a645ed26bd66a80a30b606b7018b90673bbcb26e005d8f010c9fd37766d345fdd31c8658ba54a4814d29ad8f61138c2de8a736f5f SHA512 f3ba2c2b15cda796e0b12bed308c911d9c7eac32f7a76e8c7fd05b95ddfa8297938db03dab6e334103c3574165aa2c8eaf9c2d4b836ab36ead5304a133fad550
 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 c967ca59653f..57477f67e32f 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin amd64-fbsd ~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 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"
 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 9d943467d264..4afd97d7cbfc 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.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-fbsd ~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 ~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"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 53864b1b498c..4c392b116648 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 821 BLAKE2B e07cd93e14f9a237b35b56712f97e7282d3ff16eef436b666747b202f86563bcdb253cf37afc13d08e240a201058a7fa03bbced3921917589d05f083b664f5fe SHA512 42a7bdb8b403ae4aff4caeac0f29885823abc5bafb8985d0308e77346cf1e8b28f599e846b687fffbf15b76e8911b4284bafbb3b5636742b14924bb054825217
+EBUILD autoconf-wrapper-13-r1.ebuild 799 BLAKE2B 32f8715bdd0c9cfc3e9ceab102e568cc97ccbf3e90b995559bbccde42b11912b952f661f38f061ee1e645c43453e642f1186e0c309e13649437780a829da6ceb SHA512 d93e3b10531c1c290439ada7324330ba7ac093a9e387866810fafef7009add757c76702072fc84a12daf61a000caae839f584d8ed0305dd261f4e58edf282879
 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 b826052405ef..d8ca4b7c25e4 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-fbsd ~x86-fbsd ~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 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"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index fe5cac98d914..89dd1b9e1828 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -9,8 +9,8 @@ AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-2.13-r1.ebuild 1561 BLAKE2B 9bf085c6dd042a6a9cb3e741c4e1f19c036c14a0a390c77dcaf14e0a06584a7f86f3059b855befd469c5ae74c542cec47893d5a509cc7cba2012a24587edf785 SHA512 2c6394069b00107185af4b3f6459fc2bd6499963d3e8e459c3801fda972d13f69ef69524be00cff05aefc7331869a91dc6fcfbf5427b0774452aa61c99312358
-EBUILD autoconf-2.64-r1.ebuild 657 BLAKE2B 7c1944b810e4db5d75a82346ebac83581f2d787fbdbac95321311645880e832395cdcc85c822b966181dfb3a2331588e2bd43732bbe6d154331c439657719079 SHA512 dc82abefe65723dd450ebdb283deb95bc0f9383bbf1c8ffcec57c95acaa2fbac6a372a0d58c6fa32a4b593f7be91bd6a9c513c174fc5dc573d9fbbee258153bd
-EBUILD autoconf-2.69-r4.ebuild 1355 BLAKE2B 56f27427eb6c6fa923123953ee011f7663847590c908f6b837b74c0c67d6e55d780ba7843af95986db20329218f01354e5d9248d30fcf7740466397e71d07475 SHA512 0c48b2a018cacae3f2d596e8ba1bfc12c4742a1664c5757d14867083a053be05746ff07f26b2af0b9bda15ca7dca2a64e311c7a278ada99752c78b9b3f9d791a
-EBUILD autoconf-9999.ebuild 1183 BLAKE2B ccdc72b1c0c3ca4b5d161365b7efb434413838cf7f8754d4ae0f7d92eee09a8df6f1c3e1c0807297fcb5f3a957d2962d64abc4e53704fc9016939a7f23aba290 SHA512 692c84df0de46039828afbd8f0bcb4bfcc13e9086d30701f9fac4473417a371e12c12ab8730c8390ddfe07f194840629f3e7e37cdc57f158b2948d7eb571e227
+EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 4fff8a2b6512a1e272be9b67952c936afebb588c4cd3d4d7d6c6dea3be573551fb4fd8c67cf3f6f0987123a48cd7523ece78fd9155b1bbc148ffbb5fad6458d1 SHA512 90f5b3a2b8081b9cbff7d6df8cf5a87bd169a8f02a64ca1de5ee90fc06e897eb076cb394a009a09b70318bf0d58511708ee689fee7dbcfae44f687a06bc57bb9
+EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 64b82342a9302cd8cb6f72ae71e641c19100fe1983fbeb60f001a13ab1eebd4917d0de76ca7f99f9e5e19dd69f5d55f12055c4410797e6adfafb83c2e8dceff0 SHA512 a66032c3bc48daf9d763700abedbdedf90e90d05bdadc2e357decfa1ca87f9b291a561197a7f85731b71ebb1de656ff1af55af38e7651432884660d1764f5526
+EBUILD autoconf-2.69-r4.ebuild 1333 BLAKE2B 339f336d60a2131094463909dff0700f5f7097633e5b890c2a1d3a7b72119875c9605f362cebc1ee868e420ad5000784f84a3e253b238f651ba08da0c2fab0d6 SHA512 127ae0772b786b31d708f703e21aedd405a435b80c2a5e4108d4f5ca28c0e92b2632ded6835968314121966c8dc60ca112d98ab57a14e454476c3f0d0d71078e
+EBUILD autoconf-9999.ebuild 1161 BLAKE2B ded76045a2b945c56bcb4ab3bc094ee06dc0eec6de760420b239b15598c454c5c3c92bbcb389323a4cc241bcaa67250ecab2c859aa3a8873b6db7c8007be1363 SHA512 e2f16eb169acd4ce1ee0ee46bf96ca12a44190e50a300ca45509e0483f50c65a4f73035532c9942ad9fa6119d2859b9262a7970a7fa4947c38b29c622dda5432
 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 5b2a5e4cba32..41be79aff81a 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-fbsd ~x86-fbsd ~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 sh 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 e02c4244778d..146216a4cbdf 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 ea60fe3c0961..b4362d47d8ea 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-fbsd ~x86-fbsd ~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 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"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index ba8369fc077f..f728a1a9f570 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 94779e95a815..ecf0942c28c7 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -8,10 +8,10 @@ DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32d
 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
 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
-EBUILD autogen-5.18.10.ebuild 1144 BLAKE2B f10a7b680ad7c3f0d50a7abbc7cdb22f057006d60791fff8ca2af146bdf35a981ca1648642631780d2fdcbfda2e64066350e4da10527807ac90f82b6c781dd5e SHA512 cd281ae6ce63f836774d82137f8326cd215f946a7827d0e2c318de7f507d74f6218c4bf1bf059c25c9d9a2cc089119b84e4b03c8c6f69d4cf96931c90e43a1ec
-EBUILD autogen-5.18.12.ebuild 1203 BLAKE2B b66487c33b2e9929b06357ed1964a7bac33f982fd10bcce2f1060776d0f4b4c7eaf351feb88120b131670e2db3d69b64d0490ae7827ca9f6a19513dda969977e SHA512 e2699dd820942e1eaf147e32f92ba7f66d02eadb4dde7ca1817dded7560af787868fa195038cce70448e818aeea198f70b5b1b7451a7d6f42fea5a4641cae13e
-EBUILD autogen-5.18.16-r1.ebuild 1869 BLAKE2B 232d34c5ca35de43fa4441fd058ba46b653cb5298a477f7539382b7331ee2edd1af6d78924d4f5373d02346c4873e0fe701f5372feed0d041c133c35a36f5f7e SHA512 b1bd9e7ea47561b38b8e763fd25860aecb3bfeceaaeb85326adc8226662bfb56b84e67da1f149300e1b78e3c83864bb240b3cc4a82c67b9caa919b7540b381b1
-EBUILD autogen-5.18.16.ebuild 1567 BLAKE2B f3077c810d9e1bff53730a57b687bf3c82b899035c84d193f5d491999c87c29ea16ef5622501dad821e9af27556ae2f8ba7a9c5fd25cf24c9bb5488ebe3bfca8 SHA512 4125f2681f8973577e0667d09017145b3c91b3eda8f8ae1504f605893ada5e22a0cb7ae9572f752527f54af3e27091f7ed9f1e7fc138567a5f42f665c7918677
-EBUILD autogen-5.18.4-r1.ebuild 964 BLAKE2B 61f358436309dea7b7f8f7336e9d1bbb689f4c5b901fe0997cf01f8f682e2d8d40a69555f71a1dd57067301e3be520866f1abe7cb59a16643ca97024144c7c3d SHA512 ff910273519ed23d1307b1e37180eb2678c3b2474db7458a62caf187480b076187c1129e32274d7ce11058f92e79c0dfefefd91ad17046f2239c39a91c5e7567
-EBUILD autogen-5.18.4.ebuild 977 BLAKE2B 959781466ca3fbb9b5a1a1817502c674628dee24c021fe37ff84294355a604d1015c22191a15e1dfb740b9dac03ba827d9e581bcca3431c930aa601180933d7b SHA512 597b14fcaefb0f95a8add36e74418060857abfb622769b813f1701a87c6ea8c3d78a61a71183e9ee60c2e348643696233cf47a6647860615ada22c0bd50843d3
+EBUILD autogen-5.18.10.ebuild 1122 BLAKE2B a780b77086e394228ab3b02bf656745dd90a8dafc792e431a52454698a2841f2297c7602ca4bd46bb3b651c6984031ed52bfc87f8764c4d1bef64d6b7a4043bc SHA512 928152080c981a9b0b8849f97213665e90f87fff7554ac1f829f4346426a4fd7daf8a0e7b6e17c5a816c2707dbdf6d3d47da27f5afb67f20bbdbe3218d77d0df
+EBUILD autogen-5.18.12.ebuild 1181 BLAKE2B 37d730c066e642885fc86dfd128e8e20336c24851c8c2d4eeb2656a8b340de707ac6500bbb1bee3b1588458bc905de2386a9c1901c9bd6cc5637628d3e9d86c1 SHA512 bf8e8efb8c1e0f2b4c7da1f09c3c849b4ccf7db7996a599cfeaa0a22870e5bd7f9cb588b6241fa33a03aa3e05c0a3ccaa3bcfda4227e9d71d0544a89c2f3968e
+EBUILD autogen-5.18.16-r1.ebuild 1847 BLAKE2B 361408fc3f23ab0baed355fda9c3657d1aeab59013b64c81968aa7c72e8acd52494f01bc9ae0616e811c396e394fbcb85b362a5c308d66972db561b6bfeaf83e SHA512 2abcf27eb6a5e47a5b9a1a9cecb5abb347b357b8f8ef7db73d0d002fd6154d43f6f8d4ea48c8638adc3b9e1b5f9a988e42cfe4e91d042610723ac0f5ad9fdf56
+EBUILD autogen-5.18.16.ebuild 1545 BLAKE2B 48743c3b83053a2f3dbd97f5a59667bdc874aac402ba160d749778f729ced839941f83e0a37a552d2d939783ace2fa174ae12470f3b602f0d781050dab646709 SHA512 cd7a7be7005bf259b53cad5f58aaa70bf76388392f8166b08d3dbdfbea5efa659e1c38632efafcfda5cd459443d4706ec2774ce53e7ce612834d8c64cd4dfa29
+EBUILD autogen-5.18.4-r1.ebuild 942 BLAKE2B 059e7798f0d297543be2025431c1dea283bf862087a780ded71d8c3931471a023cc29145b0927a7d5b0b96426994b7308d1e85b8dece644b33eb2e2d14d2b7bf SHA512 8ca5b616d04218e76c8895ad27d5a4da9424104a0c1252668d6818b4e4640843d96a140f0f5c96297577cc0e24215811b9e46fb02da018d2e34e4b6dd0eaec45
+EBUILD autogen-5.18.4.ebuild 955 BLAKE2B 339d84025eee4ccf42cbffa73978b9ba7c6fbed70b2308854279aec5b185bda5b7b99350c7ba1628d1245a1d73c9295204841b9d98d5c47962d2ecc01c242e4f SHA512 83a84c4079ee75739177ce921bf997d0b452039d7930d6661ef9a84521941b8ed629e1430e5acbbc2887dfa588e020da92868bf526a500124193108e7ea39cce
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.10.ebuild b/sys-devel/autogen/autogen-5.18.10.ebuild
index 80f6624da102..ddb0e9c23ccf 100644
--- a/sys-devel/autogen/autogen-5.18.10.ebuild
+++ b/sys-devel/autogen/autogen-5.18.10.ebuild
@@ -11,7 +11,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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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"
 
 # This should be guile-1.8+, but upstream has a bug with older versions:
diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild b/sys-devel/autogen/autogen-5.18.12.ebuild
index 7ff8c3632713..eebface9f0f5 100644
--- a/sys-devel/autogen/autogen-5.18.12.ebuild
+++ b/sys-devel/autogen/autogen-5.18.12.ebuild
@@ -11,7 +11,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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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"
 
 # This should be guile-1.8+, but upstream has a bug with older versions:
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index b2f45d68237b..a10a119e2d26 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
index 820e21bfa5a5..602970a7a5f5 100644
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16.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 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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:=
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index cd333f3f0d61..4e8ebe886019 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
@@ -11,7 +11,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 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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="
diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
index 5787d2af660c..df05f7d08a36 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -11,7 +11,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 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+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-1.8
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 2dd07bca4ff1..4c284fac7837 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 921 BLAKE2B c69e6defcc206ae1fb868a51098529e5ab5bc37697163330c76b30aa346a67ad43db7d0aa8d9c0531b44cbde7039f7b7612b303746931560d31fbe695cff3c90 SHA512 8938c1532045c3b7693729e77de960ac6f8a1f95fa32108cfa697c28ccca21fac4d320f4beb92c5e33cdf1b8cca39b61f4114d3698d210340976c2a86e4ed6d7
-EBUILD automake-wrapper-11.ebuild 933 BLAKE2B 63695181fd7e6370a7d35f25c481f68a94ab199edd9d72b6ac4e0779f2ee7d949b7a3a8e86407466091063d51c54cd205ae29634fe47ea26dd5572309f1517a7 SHA512 11ae3f9c1a875670b67edcc870c00cb2385b6c8c2dfd24be2eafeb3fa093179b1cdda8ba627f5a47cc054b995ea018786d65a8e10000202d352e6fa349baf59f
+EBUILD automake-wrapper-10.ebuild 899 BLAKE2B 0a037b0f806226d83cbbf1aaa21de166a269a2bc33f8d91d12a00b96b67316f618c476fb423b3f7ad60357dc5ec609e1e0d157a5cd134c25d31465771d125b73 SHA512 39dd82a6d99bd32660b92070d068e25d53587bfe47d673738a933fc765734f05c3e34822e6278f4c925325a9ee3fb5c4afdeeaa8eada3018c0280591acc69e5d
+EBUILD automake-wrapper-11.ebuild 911 BLAKE2B b25acc541f2b685af3245f0006531dc9a145536dd3a9308b2734c98c20a2181896ecd6187303781bc5ea8a4c194c7428d80d5870627f2f54f96e3a3068e1826f SHA512 6a3ce76f718f47803bd1753354cd05393e11508e191f4d065d3647a66843658fa5dffafc8da3c1208faa42217a38270a357128f31a103ecd72fb2fcffe3a1393
 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 986b1e36f941..4b970639eae2 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-fbsd ~x86-fbsd ~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 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"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 24cc3a9729c3..3d398a8dd319 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-fbsd ~x86-fbsd ~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 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"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 379545178dc6..994d31a93929 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -48,19 +48,19 @@ DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c63137
 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 2440 BLAKE2B e11c3bfd60ed2dca2e3904d99fee2f9090481bc5c76c1c2f1b032a52d87cc45a042cb382b5d048ec53f965e6a36461f99ee7ccdac5b3b90efebcecb7ca7a5a40 SHA512 bf3261a205b5bb7e37b6980f3cea00813a466a04acd58814dd179b83ed7251969990e835124ade2318a51556be140bb296e492bcad7eda05b98dcbdf8ffbd6b3
-EBUILD automake-1.11.6-r3.ebuild 2671 BLAKE2B f49f2dc8c7cd9e44f594a88eb8ae2af417ffadef3c9bfb9c41ebbf5df4b00fed2f2b50f1c1aac9ce1b336b03df64fe2052ee3ecb2f58d25c92d6129db74dd02b SHA512 1ce3f2090940be931eb31f287ac2e3e25b86cb7c2c81b8ae141a07391e858e48c1d2d74657b32b4351f574f2a0c8355c3441bfe0a6174655dc52e134b1ad2d87
-EBUILD automake-1.12.6-r2.ebuild 2453 BLAKE2B aad2518b07ccb753e75fd781682d086e392566bb3fab3d9315375908e6fc158180752dd4062fa3da0a678cdce898f61ec8e87d62fa408b74b1dcc1f9e1adb8bd SHA512 0751943e03f6e911afc4121ef27881ad58588c155d3e736ce407ecf60dbb012e39b52d7222a41313086385de31df1f99a15d22a8d324d18c23132617638bac8b
-EBUILD automake-1.13.4-r2.ebuild 2706 BLAKE2B 875195206ef5bd55c18c68926cb5280d518574a78fa3324d72bc447c825836acaa9e6fd296a8b8a182454878e3375188878cca24869cd693cfdd0ec873f48db6 SHA512 bdad9e9b5d5778532f02e8721124da48e8c61b840fe8a1ccfd24d338ae65c92535c9a590f60ea4f9b1e3b3130ee406446e706dc4048bda38020d73bb35bb7410
-EBUILD automake-1.14.1-r2.ebuild 3125 BLAKE2B 2fc90868dc1dbbd3f5131d23812c0b79c020f982d3e2cb0cf86848ce6e4460c77585260a822087b39d6c5192b516f44bd1c1dccf9107b3d03c5a8dba19bea3d5 SHA512 79906bb8fb24b5597449f0e42226cd3f454151393f9d760e313ff1ee434c7b9a2d1defc84f3b71ac7bc472cabe56980932a288ca3696fa89c809cfcd17ef2b79
-EBUILD automake-1.15.1-r2.ebuild 3230 BLAKE2B 11ebb654eca04908b9beee5c00246c5baa0a93afe1cc87b56aa4379321daf75dbb3b7173567d906b2d31c3f581f314ffd2438a0bf8e49ddb91a9d8d1fee25639 SHA512 73438b3ae2ef459cdc5858957b04136d2f65d75dd8741c3f12fe1df9b99db05f1287b48e63db87160179acaf0666ecff38a3e6065e25fa2d88517ea9c3c91786
-EBUILD automake-1.16-r2.ebuild 3295 BLAKE2B ef845456a8020f27ba47131af8573016046fdf843aa38faadd76c9dd54d64cd3989193c70c9a7051218d9488f31ad2d28a907f526bc910de6256fb71747312e0 SHA512 17957c4f569dc4f95041de1cb77f3b11475e7777588467761a269cfdc526dbc9ba86e16bc7ba29ce61b6e1ef04ae1889d0558146775c7ae8b6a03b4b4737f9ea
-EBUILD automake-1.16.1-r1.ebuild 3155 BLAKE2B 0af5224a8c112ceb9c0c910ab4101dddf98f5159d2db94d7fb297a723e12398973a6cc44b534ef037208e87ad8265fd60482cb2a23e6369a5280742da338cb50 SHA512 f2e6c8c14446029b4ac540002b93112db1c22e8cdbd699a85cd368821a3bda1672480ae73da037f4c7d7b62730fd122e73271564b00264aa9a4602d42fec85f5
-EBUILD automake-1.4_p6-r2.ebuild 2481 BLAKE2B 6247d6b13d0b5902ffc48b15936e69a45300bda12b236a80a99ba31562e7e1706201a1ff56c8cf0a6539c50a2e2b44972018f5e882e42b4801b6b1e7ce1b1e53 SHA512 db4daa874be88149d6eef10a8babe82bdaba6125c7cb5413a1c6b01a28cc7d0933adca8c1b6eb2aa31cb1e708cb6ec0404138f1c2661b4c008ce0c2a80d5c0fc
-EBUILD automake-1.5-r2.ebuild 2299 BLAKE2B 4d2c160631fb5dd5f3803a37168c90941f1d60890e0ec707a1e27a6dafd4dc960f54aa71c1beb0d646948dbc6a317aec7e2fa7805d587cef417d0e5227ea7984 SHA512 13f0e0ffb4b322743bb7e7922f380f77faf5fb9106055a540a66cce0663bca3bfb670d6d22d5dfa0e3c9678b4b20e7cbd17bd6719497d99e334adf592cf1d9fa
-EBUILD automake-1.6.3-r2.ebuild 2047 BLAKE2B 92a42f972d1d976370774166e25a13c399b9b720a228f2c7cfbdfde9ca005bbb33c6fbc53a3b40db8984b0682f512510dc0ec3f0476edec7785224fe6f8da9f0 SHA512 22e21b1a05187f1535f082b16a3607bc9f88270f2cfdf2b720491ab9615c226b2229ffb7b38dadb8a20b32fbea1d54cc7737d72b5c1aaed7b488dc88450f8a7f
-EBUILD automake-1.7.9-r3.ebuild 2202 BLAKE2B 53799091072558b9f99744cedf87aafb8a7970cf45bfb3a73875ebac250ed89b4304d1a0591ab8fd721936e4a9ee449722ad0d2f20a6abe5bceb800f6709ab48 SHA512 61897ab690599c4b653b847aa668a1ef22f477237fe57bc69acb8024c326157b85d49527a1555aa6799d682475052a8cc88a6de0682bcba59f8618b473489e86
-EBUILD automake-1.8.5-r5.ebuild 2229 BLAKE2B 057da2c27f531aa821021a9decf048452a7f5733d36e417cd707bc9a23ed2c91201f0bcd6fd9d9eec179f21531019e71cf682daad40efa06df6e510a37c3f892 SHA512 16264cc047c6e0df06ec3d921c778852fe27a63902a26acb1edfe2ff9bd74bfb316237edd618f38fd77a40d3a3af140d24ecacc6fa78ed5e026a37e4c75a96af
-EBUILD automake-1.9.6-r5.ebuild 2589 BLAKE2B c14193d093c0337b500e64566a65c269601124621a6f3bcdf9ad492afabe5e0c3814202cc606225a856b307a3d6c7f05bd45f088d95fd9d6ea4635ef5eb31d71 SHA512 c648f3a5436804437b4f4f90a6cf1fb29046b3cc866cdcaf4aa86d73128f53b42389531716e291fc8a3d49c1837b31f08e1dd0153840826a55be11af1ffdeb51
-EBUILD automake-9999.ebuild 3161 BLAKE2B b4d5b7989861626d62d9fc49c1d9603787983f1b2f19b32c582a3c1c84e1bf5858da4ec2501cc479e7c21904afbacc263ca3f9401cd7db71bcd047905a9e30b3 SHA512 6b23ccadd3c20f0162f5b9f5050102e58ba800990291d44d590488486d3e40733b64a75724d07449e0a1a017757061d68a524f40edf472e46ad99ce1be66b50f
+EBUILD automake-1.10.3-r3.ebuild 2418 BLAKE2B 72071ab5f5eb2bc8d35af0c90f12b850ff2b7723d6b872f7c1c335f0c0d182e254d204450bbab932939ec1edcee851e6a2ee6ece97a9fa07c15649da3ee8a62f SHA512 dcc694f21755ee1f0eafde66a423bb37f08e09ec6ef0460c559a1c79a33c74f79c617afd0af9479fdf856d16f8f1718daa8117d90a1dfe389ef9079ace5aec01
+EBUILD automake-1.11.6-r3.ebuild 2649 BLAKE2B 91d9716993c1349baf24824c18a49e078629883d30fc7b64945ef08581f12bdb3f2ebc53e0f1cd676444a48efac647a23e99e61c9863bf1657310cb21c0658c4 SHA512 b8977b48514dc511c665b01ef481bbd9bfd6508ee72706b58a1d206c86334dd7c2f53ce4be476af7b7de61bee6749da032a432c01c8d074dd51110c85bed3df6
+EBUILD automake-1.12.6-r2.ebuild 2431 BLAKE2B 422f23bcc8ad86604d31a2b2e438b6908b655e0832cfc54f97e6c65ccbbba249ec5f2895d6a8f473f1a82ebd32b0f2e1086a565e582d2e55d6ca8eba5c6cf9ad SHA512 bd5fe0a20092a425a729a1e2fe0beac172b4510f6145e81cd938dae25a14e895b209896843f8378fdab63298c903ed6ab1264a583f92faefd8aaeb52e6906c96
+EBUILD automake-1.13.4-r2.ebuild 2684 BLAKE2B 74f549fc4fb0e067d7bc1df646682717eea32cdfe591986a8a87b3c7a12805ca6c30e2cdaf7bfc706321f6b7e58f98e25d208cad7532f385e6edb2f148d64c48 SHA512 9017fff85ccd8cd73503c711285743ebc785156920fda2eec1921bd518f384a5618fdcca378dad5a596573e8a09f35136e5e1505b080e60f90710f6100f87145
+EBUILD automake-1.14.1-r2.ebuild 3103 BLAKE2B ca2d0d49d7711bb4756e16a6cafb846fd8e8d1d2b86867b23082ccf94bb0be349c79c693d7f4c776d87bb6d7b939bf3e7137617f6156468131d36cd18197008f SHA512 b0cf20f4d2903c746927157547706c572f959d873c23a1d51714abaab22296ea5d9ac2e7542003c52045779e1d2bbe230db64585b12faa594bae5f1d5733e640
+EBUILD automake-1.15.1-r2.ebuild 3208 BLAKE2B 72b916c78b223383f839fd4b11ed3af06102aaa9a0d1faee48d7cc2a7c710a6f256e06fa44e31e73e74e60d183a8c1304f1e6aab3392a5b8e737ed90b34a1379 SHA512 e422e9c7ffd50b0c441b5d6166b222a7d675bb1280f3ab0964584276c2d96d98159c6809b6d96e2c4ca955def55b5da4b84706f5a3f124d65b2c19dca7d9620e
+EBUILD automake-1.16-r2.ebuild 3273 BLAKE2B 682be1f463073bba82c8136aed554f61cddd54cd5a7e0fa904adeaceec11d3f23a40799a02746ac3e7df48db74d169d03638821cb736aff2dedfa5ced10c3d42 SHA512 63e9091fefb70b46316a8c238606f136f44ce983e641daa61a7cc30fc7df99f70be021f05cd3f443d2c936c72fd6a9ffb6f51de352568d864353f804b0bf18f7
+EBUILD automake-1.16.1-r1.ebuild 3133 BLAKE2B 3a722c5a3a8cf286bf1e20eef5625cec14ce4f1b68618fe9915ce898ecf240d7cc305907982a210c0a9768f79d9a6fa892918cd2cb2bfbf6394bf3cbc08d5dfa SHA512 b26f988fac779d2877ad05d4659c4302bff8f7683954fe86c6a1df08b12f411fe4722e3833dd3111c39aa298bae0fecd46960d64f743f532562171f152dbeccd
+EBUILD automake-1.4_p6-r2.ebuild 2471 BLAKE2B b950f7e76b9a2243f70da8089466fd181c8307f693568103b6a79452c70ebbc6b50110157f2915c29f3e6b9ef7b7ab2a016181784ebcaffb70602ba5cedf73ac SHA512 2a7b657da16fe2e04bf50e8114049b7df2ef4936e36cf79a5155a4e93d7a8d2225b0afdec1b5595ce9df1c1c6a15635d07e314911228a115bb8b0f60b6be775f
+EBUILD automake-1.5-r2.ebuild 2289 BLAKE2B 8c79660b2fb3d9d7fb3bd8cfe6c6adf8111af88f67e024e8d335d0fc13b091749ebca114ef56121a2dd7f2c71608dd8bad4cf56b1ddfb42380c3abb034557def SHA512 c443ac4458dc16c07208f3a93806b90da67338e7229016ae35a5696a7d6f56102c874ddfb990550b5cfbed78b1b567c164851b22c5c9718853c23d97d6a7e591
+EBUILD automake-1.6.3-r2.ebuild 2037 BLAKE2B ce129f375c762152271961ed31a7ce65256c897c90d5c7eee3d7ed2e91cc66f6bcd65e455dbe7b4c597683450f5e62df18ed791a593df6087c27e6e3a0ba140d SHA512 65f8216b4f73f4ef8a21b0908f68cc8ddc41164f9e53a1816f608d2af3d58edc0816bb8e81d46f7d248d911f911cbbba9db66a11b8f7256d54766d88fe08a472
+EBUILD automake-1.7.9-r3.ebuild 2192 BLAKE2B 0bb0d987c675660bd1d5eb69dd6c81cc8d82532380f330df4e7a1c49780a5ebf6cb7cb299cb30dc0b8f368e25d6f5902b32d3099fa115d46668e7fc939139c7a SHA512 bd650f892c870f7be1e406fe37b6e3b2fd503fe18380457529f27cca63bc7b7cd1b8ccdd2745b1ab42039a73166079ce0a2927517649da8d77dc925299478495
+EBUILD automake-1.8.5-r5.ebuild 2219 BLAKE2B f0dfc9668219d32a28b49bc755eadc2c19ab203477ae97bf768d74c406672356e8668806550e0deb62c4585b3f14ca8115678e25f31b49c76bc47ba75b1ba038 SHA512 1f4b3276146848ebebdda9e62bf4d7b365e29832da30736a92cce156b5831e594689d5a5396bf89aacfbf7fb13a0975dd568f654932720f18d3054bc4d1d26a7
+EBUILD automake-1.9.6-r5.ebuild 2567 BLAKE2B cd6c2db1c38a16206399d687bce1ed407496d1374431508a8c99c7be38d590c4e844e168660b01faf951c6bfd4acb8cb3b0418def0797f381969c1fb9cba4cc4 SHA512 42ab8ca19a382aae897c2cb09aad647aa4976b02d31a2a87db67cd575ca1429aa148103769b7371cba2312da3883e69859e530814ed4c9fdcfabba7fec39cff6
+EBUILD automake-9999.ebuild 3139 BLAKE2B 2b8ea5bcc254a874184b24b9839b42a9ee8b54089ed1083884f14d236ca4089b0b6fd06e0cfb6497bb8673fb37488f0ae76648b5205e7203d1ae2dab4968d92a SHA512 0b4c34e329bf1b407d5d420eac3f17be6ee12fe2a5baba30827a603b2d1eea9a0f051c3a6ff49c66cc52b17135e2444328623b7fba2198bc167fadd7b0f505e3
 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 015bc188bdfe..87cde0031df6 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 e9ac868dd303..5b7598bf3a24 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 d80bcbe651e6..19980a850048 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 5474860454bb..0f3ddda57328 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-fbsd ~x86-fbsd ~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 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"
 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 86b068329b36..9d459dca58dd 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-fbsd ~x86-fbsd ~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 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"
 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 239f42ab64bf..2bb05e601da7 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-fbsd ~x86-fbsd ~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 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"
 	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-r2.ebuild b/sys-devel/automake/automake-1.16-r2.ebuild
index 3eac147a2deb..d0738fdbefda 100644
--- a/sys-devel/automake/automake-1.16-r2.ebuild
+++ b/sys-devel/automake/automake-1.16-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-fbsd ~x86-fbsd ~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 ~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"
 	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 a3b65cc2b2a3..ffda1b05bf84 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-fbsd ~x86-fbsd ~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 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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 80d58e97e825..6bb6383d3e22 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 8edbe1ad198b..ffe3557ac6a1 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 8df177642d48..28dc45083bd8 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 5a1cc2feec8d..ae81a6d4b1cd 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 ed3291d3499c..6e364d2599c4 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 432665df7012..44f7d05137ce 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 9048f1838d5c..6932450d2cc3 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index a0591f077e65..92630dc9b379 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -5,7 +5,7 @@ AUX bc-1.07.1-sandbox.patch 3669 BLAKE2B 9ea9a75dd3534b1fea0ea1053bf95f06a78e921
 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 1613 BLAKE2B e1d2fd5f1773de65df554e46c801c52ebc2d808e1b297c8cb04faadf95d19322b87a3407f3a7c3481025f2eb8f6c5a5f25a67f7c0c773ad97d8114a2eaf624ec SHA512 4627d647763feea0c67664f448879765fb563870ee3b174788ad0f7fb7ee3ec4ff4240655efd56fdba34d3b45c4269f0b6679200696a3a80ce2a25baf83ab647
-EBUILD bc-1.07.1-r1.ebuild 1261 BLAKE2B 40e70d8c9b164a934634cd7bf9b6da91bf996e6e20c8425ca7842a28baf13fa8734cf488b8dd403ea11984fab8dae743bfa517d34d640c3ba4da3b3e51553f07 SHA512 07c5f45dbf604a8c55c7d40da6b560f343deef9e97ca14c0749e894ba783e4952cb70a34ccbe627a6acaf9f9d96106f9105385ee8a5d3f9b948d17885deea857
-EBUILD bc-1.07.1-r2.ebuild 1769 BLAKE2B 25ec74c73c57b009ff255637a575d17ed68d85684a46114ec5f90b3fc4e2684d44af65413a1c4c5c27e7079c6cf1fb41d12a2a65b60363a9719f9ad2afda35cb SHA512 7021ce6ba8e3b00424834b47716d09ff36dd8cba6446f4da9bbbdae77660da66c7389c3c805118c7370ada9e1c9861d1a3bb2c7095b49fe16178e5f233c7cd23
+EBUILD bc-1.06.95-r2.ebuild 1591 BLAKE2B 4aca8552b195e20f3103573297f4921f37ddd3c5cee9490ef22dcac56a9be42204ded0547b63dd5ad8958c733597e29fc43081b3d621a7789f53a89704cbaf05 SHA512 2daf462dabce1052a19e3e334acdc188165716e011db776c18309e9c90391509c3ea2379077d61eeeef6a7da05271ef4f91e87b28ba2ccc1776e1214af786e67
+EBUILD bc-1.07.1-r1.ebuild 1239 BLAKE2B a4794290859366b9ad2c9a164488dfd725c4f659f175645f563836408c0a50ac71f2c3f07cf5803fd278e7451fa24d4b1355d75aa87f0967dd5883cbb03fce16 SHA512 cd45a1f58eaca2aa9802f8260304fa20c143ade2aa7bd16ca03bb513c40a7861011b47334abe448b597bced6e812acb9c3c0c7635a66efe1d2d85d5cfc7c435b
+EBUILD bc-1.07.1-r2.ebuild 1747 BLAKE2B 8ae7f0f150adcb6b21fd9e96ad82dc45c6f9137164ca363387f7f5cdf104b3306b6764e051fb3f4439db36f358aa077c73ab31098cc0c7f53ea2aa0be95483f9 SHA512 d7faf63f9d4684d0d8d106a54e5b61a935c1f795d0fc21d772287cb09d398ca8df1653f507cb5fccbaba740bcd9b210315a5c32820e2f623d048a7dd690774c1
 MISC metadata.xml 389 BLAKE2B 39234be070bd1ff9ad6fbb7dc76420b9f030e336ca94f64784f45de9f92fd260328a8367763151c95d429a7b5ffcae9db5cbddd692ded7cd83b9d25c24b573c5 SHA512 96b8257188ecefe1dc05cd7f2c14b0df052b14a2920fec12caf9b28e5f54dd4cce1e228d68507ee8391e85ff68c39435d7d2d9339efaf06d6b089a89347a0d18
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 502df269eb60..c035526f337c 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-fbsd ~x86-fbsd ~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 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"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
index 4421c82a810d..14f6c1f69115 100644
--- a/sys-devel/bc/bc-1.07.1-r1.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r1.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r2.ebuild b/sys-devel/bc/bc-1.07.1-r2.ebuild
index 556842fcb696..14782c7a3975 100644
--- a/sys-devel/bc/bc-1.07.1-r2.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r2.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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="forced-sandbox libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index d14997d389ee..9c8a54be58a6 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -2,6 +2,6 @@ AUX bin86-0.16.17-amd64-build.patch 327 BLAKE2B 076e7fb11802f082f94f3e688553ae9f
 DIST bin86-0.16.20-fix_lilo_build.patch 3488 BLAKE2B 1a0f4240156ab36579e2e49fbfb5b4c9f9fc165dcf3b1bc1f6ca770ebf7a6dfde2d1672968522b56f59787c3a2528d7c35b402753470ff3ab92da42b26e80cfa SHA512 f307438ced09e34ce5c552f808a9d1ae09bb9bbaceee4e1e07021f810470dfb07d21a30d1447295b2d023ccf56f158f4b7f3d80d478b1d7e3e4b79b13b8e760c
 DIST bin86-0.16.20.tar.gz 154107 BLAKE2B f51a189fed52713d5cdccc880596aea9f6a5dd4a8eb6eabf2ad2600a5da520b3ec765b512261bc6ffe33ce0c9d23c5491c8c34481795d24dcec2c91e04fc5d22 SHA512 c567ad5f9241d9ed768410f988266d4ff952fd4767d033552b100a2643db69ee9d4b5929a1b40c3018db7037b0efc7b47db84fa1f561bc39f01e640b1a3bacfc
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
-EBUILD bin86-0.16.20-r2.ebuild 971 BLAKE2B dd694d0bdf99ba6f9711cf3edd98ad6ff3b66b32cdbd9d2b6221098c34a45526de6b1a7a2755b810e99cf58c5bd4a4c3cb988fb20309577ae32e4bec82c0201a SHA512 efbfee52390cef1e5e0d7146897153c62bc8c9b5887b0f040bccdcd468d33ce472c7df5e63ba731830a0fc6b8caf07a105c53db24de7cb02bbb3e1fba6bc42d7
-EBUILD bin86-0.16.21.ebuild 875 BLAKE2B 127b25d1212b1d78e2ac7f5cecb7b15fb7883b6986b6467710788a37199d516f9ef9fa7387885eb191c67cce3c645699a5c2ddd9a58a3217f40e1ebaf37dd72c SHA512 3aa240eba74f60da7f66163e30d552a316969c1ed82cd4d7e1b473322bddc57996264685ea30fca329f083c2d68af28ca8eef8f49b391c2d88088364f8fdf2a7
+EBUILD bin86-0.16.20-r2.ebuild 949 BLAKE2B f2f07a1b36e2aa4c616c1946e485e4ca378bb923af8406a9aee721d6f5f6ccc46ed5ea59df6504895fdfbbaf3542d3b9fab82b0f8f18d29eb55b4243a659e9bc SHA512 5732d07f3f3a09bd190e7e188b26d8e6f25c2ec033f04362f6e9e73e7df4bc3176c21cf6da4fb25b42adf71f3b504c81dec6f567dbd395059b3f53135d451d35
+EBUILD bin86-0.16.21.ebuild 853 BLAKE2B 5e7709784c3df4ff64b10cf74b98b79765627f8fdd8ec279f75341d49ade9f9620a39398697e1f8b12b69f58e190c79e966b4b25476ae02688a3993c34c57355 SHA512 50ec8c8d7821e8fd3d6fca9c019eca2a69af326124ea6e5ab308db564244046cefce6f2e7708548aa511806ac20e2168739a056af78d27d10fde6461f915881b
 MISC metadata.xml 479 BLAKE2B b05ad19dac9e88d9714a0a5b176187b8c3b3c7514f73b8a1a5d8f1498c02900546e9ad3aa04edc4c6a1b9d07035e8ab0a8bd66c853aa27babf302bd8ae92ea18 SHA512 89e8c96a44e57ccae73c66141904a99e0128587fd62acc8b2d3e860636ab05396e9842c80152ab27860850a7582dd4097fefb465e0d0a86761b96614d8c0992d
diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
index 5bb161c54a2b..9e0088919ee0 100644
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
index 189d5bc75ed8..3e67dfb8467d 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 1cc69da08a75..d971f83eb1fc 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -2,6 +2,6 @@ AUX binutils-config-5 12580 BLAKE2B d802830a52b76433152a073d5acb29afa606dcac6f41
 AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1116 BLAKE2B 43903ecf891d48aaa1a55aa76a0c3f786af3938305fce38074bc829f8201b6ba41760c31b956257a37dc39362330de90167f64134f381eb106b5749dc06067a9 SHA512 32586f809e5ec53b9d08204264711048c1fbf6e41ec1daf8f68a4573cc42e4b5c4698b9dd8cd333195f9548897eeb0edbc2fbc27b60b22302283d04b77c0a4b6
-EBUILD binutils-config-5.1-r1.ebuild 1118 BLAKE2B b7d871eb62106e435f48fb3a7b169a015e8b0b7538a6fdff31264a452494eac11248db9ec4fdc9b2b91447e6fac4ac3fb69121928c27edb7a1de1e7c02609d9c SHA512 1a16b5572fc7e5eb0a7b51887c8c58e811df6c1b457b44bc483cb248722a0f43c8b35d469e10f0177636cbc6767cc454e98df4fa84b04e5bdb99779b9e9ce1b7
+EBUILD binutils-config-5-r4.ebuild 1094 BLAKE2B d724d2412aca189ae48693ba529d5a7cda7c9c5ac89329b5e8198bc05c12ebcb4cee2c1a9ad4e74114bcb59f56b8e8ad8a0e0184f33d55ba71248bc342edebb5 SHA512 8ccf7c4319d889134fc3240348275727b198fc5df1aa24f1a8d4765e93bf8f612a3380932d97aaaa9b7bfcf2413d2d2881219473a7fbabacf2c29cae47b9fe1d
+EBUILD binutils-config-5.1-r1.ebuild 1096 BLAKE2B 177717730ad05153233a85bf06ba83776b04ebf1bd4ef43bdcc315c6c497b0a98559d8dafcc212d018e5e304d708cc4e83e83253517b07cc53c0573d93887913 SHA512 e6769b45b487c4c7214ba378c7e401476710b3ddcbcd4fb8f2d1a02f0ec17271c048d3767b8baaea49ffc671e36268ce5aa6e231a9ab2ad6b85ce4342c3c9c7e
 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
index 39263f45c287..db54488baf11 100644
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+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
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 57434c023cec..8c430975bc54 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index c466dec31d6e..c03912bd2256 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -14,13 +14,16 @@ DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b
 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-9999-patches-4.tar.xz 17480 BLAKE2B 8e85fb15c740e19bb27482bea134342970fe1af8c39639a16a087c1e3b7386e469d9db6b0d1c0e1e62d550c145814e3013ef65708e91313b648a94ac5c4cafed SHA512 6d09513da6995b83c24afd0799f918281198c412cb65f04e07002fed1b036fb1c6cb075be499a2415e8b286f288b80c02fae1b1dfcd288fe216254d31206b6e3
-EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
-EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
-EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
-EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
-EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
-EBUILD binutils-2.31.1-r6.ebuild 12418 BLAKE2B cc585caed5c8f42bec4b4c9023b0f3dfbc2c128c158f1a907d226129dab62958f1ac5da6c063fc5581b42254dbacde585985849f3de160c9b4a730712cb661fe SHA512 379bcc5f5d4742be1537398db91d5941d2f069341018f67011d56ec8c094319d0b33368564cc8e0769fa3168d0de37a8b66d14d7cd41d2002b0dcd13796eba17
-EBUILD binutils-2.32-r1.ebuild 12623 BLAKE2B 54fa4f6ed2c4a96b78eea139fa9992243706d2cda8ba6c50688ad55678cde610e9de5f945694b2de1e087c282b48458dce7e4102d5302edd4d653b60e1324968 SHA512 a2e9db9f3535abf9db17a81c2d006188f4894df7e4188ed4b06212bcfd40f834525026a12e0571c35ca71051b6caf1177a1fb4969cfdad5c6d364f5be0c4e447
+EBUILD binutils-2.26.1.ebuild 258 BLAKE2B 404f3410d09218c9601956568f3b47006782b4a7c6381277b43f7567822a9ad8f3be057f05e158fd8eced075e518b9d3f6f6db0af714990dd0d95bbc413ff9f9 SHA512 20ac1a4f721ebf8505096522a9c5d7115c8299942e9ded9efb0dc5c00664d2a7fc1fc90a9daf28555334de504a5a642c9080911bca00f83c819ba37d2bd3ab33
+EBUILD binutils-2.27-r1.ebuild 271 BLAKE2B aced51a4a2c90f0272943d96f18b0119b98942c052f3f85897a4dce966473b5fa0204fae934f74f161086678cb5e2bc7e97421f7f9c9522a9db32c86abddbc06 SHA512 7b810f0ad3d51ae264d3a6887c6ec48c782c722c44c599c4928345cca793e4760aca8b30657c502540e81027eda9dbd5ed754d29cac4ebd33023684ade2f42df
+EBUILD binutils-2.28.1.ebuild 258 BLAKE2B 404f3410d09218c9601956568f3b47006782b4a7c6381277b43f7567822a9ad8f3be057f05e158fd8eced075e518b9d3f6f6db0af714990dd0d95bbc413ff9f9 SHA512 20ac1a4f721ebf8505096522a9c5d7115c8299942e9ded9efb0dc5c00664d2a7fc1fc90a9daf28555334de504a5a642c9080911bca00f83c819ba37d2bd3ab33
+EBUILD binutils-2.29.1-r1.ebuild 306 BLAKE2B 580c086c26214234bdd84dc8d8d6d3931a5dc735dbd9354a6e0e5cf733fd9a0d32040d45e5209905fbb6956976aa8a94c82d5a22b9feb7ed05876af9c9b1fd36 SHA512 509208007e7facd16a240059487ff1e6ae90cda97c3c7e19eecdb98ea275a6b6ded091e653d3b59e3eb46206ff52402f31e20f047a21f065e8a764ede4b10d60
+EBUILD binutils-2.30-r4.ebuild 12001 BLAKE2B 60ea7cddfbc33a0d6273d7593ad44bd10ed2ffe9ff6a5308e381cc39bc2c81c3f25bbdeebe43f76e298f9088a915a653d0473ede73db8beb4cb8d5d6c6d6cbb9 SHA512 4a518fe12d78e6a68efe0907b53f183fc9bcd6f511a9b6cf93da6f767a49e83f45e9b1d27ec576e7204a886be4e62b9920863db0c903a824b5f38a39b6dab39a
+EBUILD binutils-2.31.1-r6.ebuild 12396 BLAKE2B 587d923630e1916f016c0d8b4bf57bf3d937cffdfd017f1846bd6590b0438258b874fd52e07b77362ee19615a6e73086436349a891ebbae3dc2a14b1e483d65a SHA512 259c76d7e4f5a518cf69cb0e2b2ed6f928cb84f6e8dffcf7782f9822c803caf2afafcc906c2558232330a1f478c9a66ef02e80338fae2c8033afc749d67d2632
+EBUILD binutils-2.32-r1.ebuild 12601 BLAKE2B 3a74a49c0e7ac48238f32dcefa371fbae58f8ca1f91fe7a155be4831d92709fe9ffeb648e736058159009ad998dcaa5bf05790e12964693f19c9e5d7764c32f1 SHA512 3d97253e2610adcec100b241376695f610b7667e3064fd87bbad14a6348c5d705bb9455fd0d2066f97ad95dd8c9dc795bcc0694221b5db112931d246d92aad2d
+EBUILD binutils-2.33.1.ebuild 12150 BLAKE2B e065676b99e6fdbba69ea35570d7aaead43c770cc8313bae4ac79c66d5175715d898084e29c2ef81871dd076c8541a8bd173d625b812ac5caf9075239e91718e SHA512 62ceb5bda8c47f13118770dac79f7ab10710a69ed47b68dba9fcd6cd6ab66cdbcfac896034a5a509e22bfbc868f9208f901f5853af6042603ea861d2a6387549
 EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.26.1.ebuild b/sys-devel/binutils/binutils-2.26.1.ebuild
index 3ed6372c313b..e3892466c1cd 100644
--- a/sys-devel/binutils/binutils-2.26.1.ebuild
+++ b/sys-devel/binutils/binutils-2.26.1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
diff --git a/sys-devel/binutils/binutils-2.27-r1.ebuild b/sys-devel/binutils/binutils-2.27-r1.ebuild
index f969f492cdda..a036cfc9ed40 100644
--- a/sys-devel/binutils/binutils-2.27-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.27-r1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.1"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-devel/binutils/binutils-2.28.1.ebuild b/sys-devel/binutils/binutils-2.28.1.ebuild
index 3ed6372c313b..e3892466c1cd 100644
--- a/sys-devel/binutils/binutils-2.28.1.ebuild
+++ b/sys-devel/binutils/binutils-2.28.1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
diff --git a/sys-devel/binutils/binutils-2.29.1-r1.ebuild b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
index 5345e72a888b..73230fd9e6a6 100644
--- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
@@ -7,6 +7,6 @@ PATCHVER="3"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" )
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
index 809403303830..a64424ccd022 100644
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r4.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 		;;
 esac
 SLOT="${BVER}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
index b07c5579b0d3..511d497ac38e 100644
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r6.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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index 184c0d38265d..ac19c27ce3ed 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 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.33.1.ebuild b/sys-devel/binutils/binutils-2.33.1.ebuild
new file mode 100644
index 000000000000..e4e5fd60e822
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.33.1.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+
+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
+PATCH_BINUTILS_VER=2.33.1
+
+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
+
+#
+# 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
+"
+
+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
+
+	# enable verbose test run and result logging
+	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
+}
+
+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/}" || die
+	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/bison/Manifest b/sys-devel/bison/Manifest
index d13ac3efcd79..858ca70ced9e 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -8,9 +8,9 @@ DIST bison-3.4.1-patches-01.tar.xz 10812 BLAKE2B 81311c4de0e70e5ca5861e36918be13
 DIST bison-3.4.1.tar.xz 2198020 BLAKE2B 03369f92959061fd780fcde38d62e81f433ec7c0e6632ddf27bfb48607fdd510aa8e2e9fefd7e130b84972e168ff0762a7bed4f7a817be36c848ec6562357d2d SHA512 544d66bf11c55a69fad613bea429667c587fb0c3774f6894df81cb3c7931a554f79e6b71d6a6e9109e164e524c632127c967877f71328cd0b69a683d29ed128d
 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
-EBUILD bison-3.1.ebuild 2515 BLAKE2B 9d5a1ae20ed4c001494d1d8a09a492c6cec0b83931903581967cb9d5a61fb736f5ce388ac9027eeec80c186358345864e7a588e78f64ab1b1170213e5db55e07 SHA512 fc236455ffb85e2755a447d44be3ad17e294c0740616b20872811d9467d4bcd12afdfffb03c573ca325270e764e13fe899be8ff6b95e01d4b29b85393a160201
-EBUILD bison-3.2.4.ebuild 2638 BLAKE2B 229847038c88e6c58e30a880710c780bb49b8278a5ebe338f3ed90b1a7093bdaf13a06ce098d73ea97306a312de056e5f089d0a3bf3095702dd545c0833667ed SHA512 f6267cab808bb92158666696c5a682afa2520c13ba605871b65b22d9405e9bb68f95074571d7a8cc83d0ce4f2286c76ef13cbf581023d9934f14cf49ef351c11
-EBUILD bison-3.3.2.ebuild 2641 BLAKE2B 318bf6463db5481304255b7d6c2e43ce309411844173fac0138b4dd583c9ee51e61f83dd1f53c9e1b783255fde2dc0ebfe7ac61b23be2ac288c66166ce9a88ed SHA512 b934f67129be99d16dd6204c2710abb3cba1230d10edb4717363d3981bc2f9abe9b3300cdd20a4bdf5622a1c2c4a4ecc868bacc13ab956d93a7a74600bfd96b6
-EBUILD bison-3.4.1.ebuild 2484 BLAKE2B 17c1e4ee0e125b13e6cacd084a4b7a2f44634c0a704feeb833009461b4ec39cbbb3d704b13f84084cda62bb6861be7c572b8f8c1ba327b9e8f16e094ddc17462 SHA512 28579037a8c1c03a55ddae11da12483f9d801dba4dfb47ed41ab89160944b3b88c91191a0b6c503014075aa9f8cc8bdc771d4e4013da108adfbfc27aeea884c1
-EBUILD bison-3.4.2.ebuild 2512 BLAKE2B 24275d3f43832012bebd7d2dc1bb762d1d733a3823a906d1e4720ff6ca9f2b19eaedf0f838c4cfd79192f8b9c52d6d5dd4910fe1a97f8cf091f4af5f0a5ddaed SHA512 62b1fddb22e25304568d32cbf6037c318d32a29752b2601af9fe0ace4070c9ed316c8b4fbe2644f147712979a543c6c5849576745d6631ee8879f92c5249d485
+EBUILD bison-3.1.ebuild 2493 BLAKE2B 96edecec59592cfd9e97aad21889839dd3a193db7fea12565a9622b1b0dda5a0f3c11020beea0c7992f552f128230c37907d169232b5f5053c3ddb5f7aa4d037 SHA512 7e7c3b339a48438efe4362357ce1931075a90c0ea8303f6d174fbe0dbed42bebfcae599a4a0e69b0e1fe35e2511a5cf1f0650edb9caf2fdb9955ad05c1552aff
+EBUILD bison-3.2.4.ebuild 2616 BLAKE2B a7c46d7d905ee1e4fd9dc5f605621c5e2c762799834bea566a7dbbeff8feff9ba1ba04074df3d6ecd687a813d7e2d0308d14e8eb61529a6ee6ef6f8cde271eb9 SHA512 6087cb186775b804536538e34e4250c38e06097039189fb6dcc20726f190a10c5660aaf37572d6c9df4402c516e7f598379fc790724e466a7e835638397f6b2a
+EBUILD bison-3.3.2.ebuild 2619 BLAKE2B 09cde707fc0ca3dc9b4f240c6dec2e6d1b9ed406b7e2bca343da4d7166ca86b0196a389a6880a8e915451bd295d8225142d18d02994b7185a467d2e1daa9aed2 SHA512 e7f4612108f59dbe07acbff481e6253d8a0c09a302bd44107f236a7bb22a2873be9a235a6d9ab884889ddddbd35bba456e462ea04ec68faaf283ee5adcbced88
+EBUILD bison-3.4.1.ebuild 2462 BLAKE2B 20418c463476728bdddbf1ff35a40ac7dd88b791288dc64605c33463515a993e460c8c3ab53f39dc5c0ec33020224b3208e5df37241e5b4faa064a2d895e9c4a SHA512 69cb652c8050fb4c4d94d1fb97770405c6670030baf3fa90324629ae3182e6ee5d7f976f333b8c645514443db74743bcef7b55e7e485dbf07bdc0265a3e18425
+EBUILD bison-3.4.2.ebuild 2490 BLAKE2B 995e2dbd1d2cdd1719db4a47dcac7f03520e4d8f8d499147faf9b7461a3346dce791117e1face1fcddc9003e98b09fc00924ff929a931ec38c13ea6ac4acc46b SHA512 2760510014129122a23e136d57d6f1aac4cb72a1366ad1a6b8ffb6ac86aee5b5af60bb4bda30586d27e35d2ae7b4016cab051ce98ac6c679cd532b81f3e07cab
 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 be1712c54450..837f2d7c557b 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-fbsd ~x86-fbsd ~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 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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.2.4.ebuild b/sys-devel/bison/bison-3.2.4.ebuild
index 4d3d12b7fd05..0357b2808cf2 100644
--- a/sys-devel/bison/bison-3.2.4.ebuild
+++ b/sys-devel/bison/bison-3.2.4.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.3.2.ebuild b/sys-devel/bison/bison-3.3.2.ebuild
index 0152b3a3c35d..365abc303bf2 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.4.1.ebuild b/sys-devel/bison/bison-3.4.1.ebuild
index db1dd26f8961..404b47906d07 100644
--- a/sys-devel/bison/bison-3.4.1.ebuild
+++ b/sys-devel/bison/bison-3.4.1.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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.4.2.ebuild b/sys-devel/bison/bison-3.4.2.ebuild
index 84404d7431dd..c09c53ba4c22 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 94fe727ffc51..b2fab150e4f6 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -6,4 +6,4 @@ DIST mk-20170505.tar.gz 94846 BLAKE2B b32b809817d4e50b5254c106cac0f7ad33dbadaaa8
 EBUILD bmake-20170421.ebuild 1173 BLAKE2B 01a1249daa9bbb8c6c435f15f9cb51ef5b04d7056abb084200023502b526e52d678261216ec7c052714711b52f9235ce7007e833a14923a9a7ba0768189baf4c SHA512 8e78c74d16e580531a0a8fb94119f3e7ed7c898d13dc2b7345047a1f8df301a4f3462fcdcaf7e6de74d98c61ba7ee724bd51ab7e311ef3136412bd5fc37f58d2
 EBUILD bmake-20170510.ebuild 1173 BLAKE2B 18c8e432d30732f95027a4109c7fcf1410002942891d5c7ddfae1cdbf987cd4d12ce8d35fcf65e509af37fd155e6716a624af46a9ea8f23861200208d33ea43e SHA512 63372986eb42ce9651225d89bbdee10958f3e9fa81472554223aedb407adeed210874a53fa3322f5a48ab38d16887b9118dcb3637a5a694c9c0e5ddc47a326cf
 EBUILD bmake-20170812.ebuild 1173 BLAKE2B 18c8e432d30732f95027a4109c7fcf1410002942891d5c7ddfae1cdbf987cd4d12ce8d35fcf65e509af37fd155e6716a624af46a9ea8f23861200208d33ea43e SHA512 63372986eb42ce9651225d89bbdee10958f3e9fa81472554223aedb407adeed210874a53fa3322f5a48ab38d16887b9118dcb3637a5a694c9c0e5ddc47a326cf
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-devel/bmake/metadata.xml b/sys-devel/bmake/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/sys-devel/bmake/metadata.xml
+++ b/sys-devel/bmake/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 2c9c3e16e68f..16746239ba24 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,13 +1,11 @@
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
-DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
 EBUILD clang-common-10.0.0.9999.ebuild 670 BLAKE2B 9fa4f350989a3053448c2b79cc6586341eba7a0dc9b384cc29924e8d7350944f3318597c7837187787a0d7c72aa9de91e85c28ee3d9a9181307aca66f5326b40 SHA512 9bd47ee301659bbe0970beb60be6c07ad55622dce93553ace6a182d456a9c528b6fd1ca8860073e058ab2ed3286ddd3d19fc24d38a288474de6054857f81f8bd
-EBUILD clang-common-6.0.1.ebuild 777 BLAKE2B 3f19ef0457ce59dffd312ee898a72b4b5e6d21a2f9403d159c2f92c76dd16f212beec6a906fc8652487a7bd7f0b773b86620ceb03ceeaa1974e9fd8bd021a830 SHA512 e469a91c0619ae0aca5f0c25bb14cb22fb5b773c452dbb212a32a499ff5101878455b28b2948fe118713ee5d9d15b24d470fde9a57ce38bbe46f26c0ed2c33da
-EBUILD clang-common-7.1.0.ebuild 778 BLAKE2B 3c4b98d282a9b6855673dc5d0f3bbea6a070543b33163e028ff8a39ec49ff590480a9a7303594df5aefbe720e79cfe03260ca3740a9aac1f224170d8f11d06f6 SHA512 18c930136c19cb16fb6db960774ce3905b28b997543aaf810168998b75d9cdf27dcdd591d26161ab9a9555c92992f9cf83a9157accfc76e91632e9ea54014b5b
-EBUILD clang-common-8.0.0.ebuild 782 BLAKE2B b11541f70d3dc663a09442a84f95b992fd491109ea3b1da0214a2d9912f61794393cfaa2a5b52920c075436cfc3c2864132feeef411f115888c68a310e77c35f SHA512 ecc50e293902d9e294ae6fb227c25dde36945fe5808c464ca7c6a0fd022a07d0e03325ebf9f1e4683cdc84f9f6ef41cd1ff3b45cc66ce4b2036416957d72856f
-EBUILD clang-common-8.0.1.ebuild 810 BLAKE2B b227eb1e99dbfa6a67c3d05516bfa74bfbb83482a07c4de94e7ca3631c56505eb7b6e3af3eab3b9eb1a0ea783ffd410decda0611c2b5b23afcb0cf4c7ae2842c SHA512 cb620ff8ecef88570a373d3adb35382a2fc41c86d5a25844698f056bdedf51c0c4059e972e086c05a5e6757d09a804d5f7a07aa517b97e6a1c7a773f555f340f
-EBUILD clang-common-9.0.0.9999.ebuild 695 BLAKE2B 96d0c4bc870b20db7b30bce6a8f5b74c414b41328afe3f8c1a21dccc02d06b8f894b93fbd7ca644af188e606429856dca4d6c28479d08bbbb7a251fcf3430850 SHA512 36f8228512ca9c07bc586ee4b8b0537eda0c5bda63f1df6d84d22c4cdff2c7afa57a9e59f67d9c89bdf81a134cc80d65961690fdf023de2897ab78910cf57e4a
-EBUILD clang-common-9.0.0.ebuild 809 BLAKE2B e8f6754900dd24571be2bc9ebb8791dcd5a2da1b5c1deefdbb7ec621f6a26bdc1c958b27667bc6ade46e24db9323d1ff39cca0cc30f9362c3d703f67fba2721d SHA512 0f2a824c70f05bc23c00695ab3af1e4596f988de79abea4a56225f17168cf5351ff4a4781ede103fd66ff650994ae62f729a58cb66ba43fdc679d3829c1219ca
+EBUILD clang-common-6.0.1.ebuild 765 BLAKE2B 3f71fcb29d3b01dceb3f0448d920828a0c24824d373fee861567cc33156cc4aaab25262c5c83ac293486442981aa0029ea38b9bb6e59b4d0c2af4c44725b8435 SHA512 298c3b0f6e8480abc44b7b2c0f2b945f206ce7a936f8bad587b133dc931cd4588069e3a2813299ddf8c6a06b980212295a0729a6d77f21ba74458ebaa10c318c
+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.0.ebuild 797 BLAKE2B 0e499ee0e340aa66b80e1ae1cd316b1cbf797319cf41cf4b820d4843076c00c21ac50f82898fc76190a4726f49b1c48176bab1a0636a59138f18c2987e8040ba SHA512 4e495544ce7b601195cc7f38eb251e91ee1d0dd020b4eb388ae5bb151774cd587962dee0a066fa09c214594443b2c75566bbdf04aded77f6ae00a050e898d438
+EBUILD clang-common-9.0.1.9999.ebuild 695 BLAKE2B 96d0c4bc870b20db7b30bce6a8f5b74c414b41328afe3f8c1a21dccc02d06b8f894b93fbd7ca644af188e606429856dca4d6c28479d08bbbb7a251fcf3430850 SHA512 36f8228512ca9c07bc586ee4b8b0537eda0c5bda63f1df6d84d22c4cdff2c7afa57a9e59f67d9c89bdf81a134cc80d65961690fdf023de2897ab78910cf57e4a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-6.0.1.ebuild b/sys-devel/clang-common/clang-common-6.0.1.ebuild
index a7ddd072e29e..a277aa43d909 100644
--- a/sys-devel/clang-common/clang-common-6.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 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-7.1.0.ebuild b/sys-devel/clang-common/clang-common-7.1.0.ebuild
index d3a52b4c499d..7dacf6f897fe 100644
--- a/sys-devel/clang-common/clang-common-7.1.0.ebuild
+++ b/sys-devel/clang-common/clang-common-7.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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-common/clang-common-8.0.0.ebuild b/sys-devel/clang-common/clang-common-8.0.0.ebuild
deleted file mode 100644
index 75b0a841d99a..000000000000
--- a/sys-devel/clang-common/clang-common-8.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/bash-autocomplete.sh" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	newbashcomp utils/bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-8.0.1.ebuild b/sys-devel/clang-common/clang-common-8.0.1.ebuild
index defe5a818bb9..7479a43e529d 100644
--- a/sys-devel/clang-common/clang-common-8.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-8.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~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-common/clang-common-9.0.0.ebuild b/sys-devel/clang-common/clang-common-9.0.0.ebuild
index 2ac7ea5c35fa..609bdcde4cc0 100644
--- a/sys-devel/clang-common/clang-common-9.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~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-common/clang-common-9.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
index cc703baf0c50..cc703baf0c50 100644
--- a/sys-devel/clang-common/clang-common-9.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 33c54bada378..1ca4ba17afa7 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 759 BLAKE2B e97178b934f41844342595038123b272e05847f2de1d2122a04177a87662e58860f0cad19f3e4d166e14ae6d5e1ae9a07d58395f8fb6e9766e0eb39bb49c8f28 SHA512 e2fab3437cd55db2c08405d5f7af89b10ca09c08bb4edf2e3351c298440f77479af9d7097fe96e2300701ec9f31a21e7e4d8a24e2040a47222e49ab00dc15816
-EBUILD clang-runtime-6.0.1.ebuild 819 BLAKE2B ce5fe6e1f47830366c00f80149adfb9f0ac25742fe57dd1cb1f35c30186a919b89cdb679b342ff1db3ed676bc48c58f28c85b5c74e1adaaab18875293b8be1c1 SHA512 25d88ca2c1d51c0140fbb7572fc45786a61902ff27534ad8e2bd8d12155a69229cadeee3c4827533207a265aa290e829de2141f96bc7d2181c59731ce0fbacfc
-EBUILD clang-runtime-7.1.0.ebuild 820 BLAKE2B 5328fb71087a34eb22eb6ce279a56cb094ada5c38595bf4f3ab357a5fc266b80b0c50076ce6d83f1257250329db8a0a4c62da503db1979411e5fb3acc5d5cdf6 SHA512 a2b20fbf40217bcf2454a04e7ebdff7810265ad3dc94233c89fe54ace45b8e9eab3694433e84d1447b52ff376a1a75ee8b78481067ff804f863450a453f0a2d6
-EBUILD clang-runtime-8.0.0.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
-EBUILD clang-runtime-8.0.1.ebuild 819 BLAKE2B 4699ba1b68fc54381783ab866447b12bdfc68c68f2dad85b360da74f8917829611a8e0d6c1fce1c601307eb7d6e90d160719b887b3be5aeb01e73dde49218107 SHA512 8ee63021bec0aa3ab24cc624c230b6a0e973b020a5c81239717243745fb3ac7c02c2135c49747a2277c2c5aaf434ead31d6b33adcd3dd6282dffd4306f00651e
-EBUILD clang-runtime-9.0.0.9999.ebuild 759 BLAKE2B e97178b934f41844342595038123b272e05847f2de1d2122a04177a87662e58860f0cad19f3e4d166e14ae6d5e1ae9a07d58395f8fb6e9766e0eb39bb49c8f28 SHA512 e2fab3437cd55db2c08405d5f7af89b10ca09c08bb4edf2e3351c298440f77479af9d7097fe96e2300701ec9f31a21e7e4d8a24e2040a47222e49ab00dc15816
-EBUILD clang-runtime-9.0.0.ebuild 829 BLAKE2B 5f1c36a17f575dc4e7a1a195d0fa035c4529391a6c3d61c873d8e1ac3b4bb556779a600dde20761ee4dd8ccda3d11630de979cbd067a501037279478690f4dc7 SHA512 22240d314fed260f92dfb761f4aa9901be30f4e597fd394377a6e51b112cbb5cf3d687f34546b98d5426055b82f57388b031445ef5b618455d5687268f2c923e
+EBUILD clang-runtime-10.0.0.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
+EBUILD clang-runtime-6.0.1.ebuild 807 BLAKE2B 927c27807aa77b5a1ce80d4a931ab487bf15d08a0a65a21492a248d4be82bf9cea56ced1778d81daa9cc624049558764fda1476976788f36283666a49feddecd SHA512 a7e1a2c122bd5b81e0d1e48e56756d6b8a63985a007905be0a5beae0bacf884c6656b8e6e05f41bae02bdd7c253864710f282d7fd4990e3d13412ff610da54d6
+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.0.ebuild 701 BLAKE2B 05f22220e6952e2933df92f82ad703ffc2aa743083d2db14a2c78450673b06f5fbb89de73f4ef665fe999daed3ae6c0b53e998654f57594f1c29f8d479808fff SHA512 e14e30b1083979802546b3b2fbe58e791cb01a032c7c54f983f590f0ec140af3f45da751e349647e6f875254f2998b71250e2e3d6c3312818463ff50a88470dd
+EBUILD clang-runtime-9.0.1.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild
index 34bd6e203736..806c398483be 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
+IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 PROPERTIES="live"
 
@@ -21,11 +21,5 @@ RDEPEND="
 		~sys-libs/compiler-rt-${PV}:${SLOT}
 		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
 	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
 	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
index 8dac1211a839..3379d57d9565 100644
--- a/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild b/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
index 4a662b30d9cb..9e6312c5587a 100644
--- a/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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 crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild
deleted file mode 100644
index 97c0d55cf2a5..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
index d77137643f4e..3b325d68acb6 100644
--- a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~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 crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
index 53fffbc04674..6250baa76c9e 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
+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 )"
 
 RDEPEND="
@@ -20,11 +20,5 @@ RDEPEND="
 		~sys-libs/compiler-rt-${PV}:${SLOT}
 		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
 	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
 	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.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1.9999.ebuild
index 34bd6e203736..806c398483be 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.1.9999.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
+IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 PROPERTIES="live"
 
@@ -21,11 +21,5 @@ RDEPEND="
 		~sys-libs/compiler-rt-${PV}:${SLOT}
 		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
 	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
 	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 4c77cd63e8b2..ef4e98d21130 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -3,31 +3,27 @@ AUX 6.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be0
 AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
 AUX 9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch 1324 BLAKE2B 83a02461f65f2fc660e2ad0a07ec0d75c56da04e7ad849bdb80aeec9200b2cdbfd5f283710294bfa0f4abf26bfa24da2961ac9decd9d50d9d51fbb148fc5d573 SHA512 03669ad470bd85237673c217aea0deca6080d374e2b31531c17da6594959c323dde7e187fcc3ba6ae387b03a9252d89d75caafb8ef715b49b9ba9f2cdd5c242d
 AUX 9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch 1496 BLAKE2B c35f07b4f97152f9a4885431d0e18066d9223b1f29853d558d39b35a791c4283d5d5fe8000dcb5d2f0ac1e1f1e2aaeb17a7a886b4b210a477170b01906d7274c SHA512 f57e1126578f88c3d53e15148d4e8cee41b58ff69a2a541a3b9ea55d70cabeb640e727e8d967e92123d457e058e0d140a4723d67468f426f217e43574d83e7b1
+AUX 9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch 1034 BLAKE2B 507ffab1a094b50c8b514044f02d5b8860310c61e62aa82a8c8f4c85c0a066c528ea6e4c40c5b35ea00e0b759d3c8450fd55a0704a415eb50730c82490edac7f SHA512 7fabf33ae58988d1dca01d3c456c14b10189b417cfb812b2825185c634eff6b771c3bfe8ae73d50f111b0d82b914f32160fd98cbdd1250f416ece8003ed2de36
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
-DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
 DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5
 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
-DIST clang-tools-extra-8.0.0.src.tar.xz 1996156 BLAKE2B 26c839669ce4cf531a56e8527c9d507ce458861c00aaf563fa5e58cfa2fa3897d820643746802198c8e77c9e46fc8f4b833fc3746b32d8adc0d4a09dbe3ace7c SHA512 434e4cb7b76f89b0a0af25f05f32f2f2e8edb9e9f14547be845df75f5032c1d9dbf475be408bb989c476ec667c10af54a15d40e42559b05e52d24c5fd416b517
 DIST clang-tools-extra-8.0.1.src.tar.xz 1994068 BLAKE2B 7d312c1a958d9c5b24515067cbb1db3a92b34cdf77c2345c08ef2f327d2ae4ca7f05252d72ede6569e25cda34225963a8d415cc64279e39d542449ba56eae9c9 SHA512 d39962c30ee9d8a1679d8007009b48dea2c8aaeb283bed781a9e22a1a57b8186c2cfe058da046658882ace1c84a30ddf9b4cb75bce988891189e8423b6c6a72c
 DIST clang-tools-extra-9.0.0.src.tar.xz 2183436 BLAKE2B d9682cc615ddeb2ac4fba665089658b423bea085e935c54f1e8c8c71807a9c3c910aee60652accbb24fc4dae262c7877fc7c2f7e098b118f7dc3eef9c7e5941e SHA512 70fd5cdeb8d371e5bbc369bdea3b94a1e3f450e1fdc109a2328d75b30a09c56fbed31678e211172e0a1fc1ff82c9ab4dfea4238be2cc0b82598f71ce9b7ab7d3
 DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 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.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 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 llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD clang-10.0.0.9999.ebuild 9244 BLAKE2B d2784277681be90d8e86b2891a593bbb56ab7044ebae10ff5253137a43713c5b8c4b34890e694ede4363fe96340ca6345868f1bba36eff52f33f93b63e31ce55 SHA512 59f0fa5c0420f33a65b3ad55533efbff5cd7535c417368f4abcc24533890a19ce5765af408894681b255066aa150ffde0d92453a0d597f8265cefc1605b0df1c
-EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
-EBUILD clang-7.1.0.ebuild 10354 BLAKE2B 959fd75381491d151b8fde4929210f2251d25cab58fc8733ce0431ec3c15b738679246f98f6d3c67d748f43a45698d633bfbc2968a0482ebecc84d32463fc848 SHA512 f090d4779ed264b6a9fb7864a5f6b924d7d7e9c73864cc11023377f847a5ac6c55439339c1b688874daf556d6ce8d9d93e4140e5233c7c41a1546dc4759111f4
-EBUILD clang-8.0.0.ebuild 10158 BLAKE2B 5864138aa69d8cb51fd0d378516aa83a50b30fa57945a95e159740f42949ccc4f9551c2a851170cbdacd2e93982a76fb34f883657c48d4839bbe865b906fbe01 SHA512 f4eca2292f261751a243bb9b50a2b8aaabb6e0f331ab50ebf88e6b1bc5b172c0e0a0b4efa0db87282d8cbfd0f13942e95f986d75ce9ee0d935a75194b7a1a313
-EBUILD clang-8.0.1.ebuild 10252 BLAKE2B 3e22b49aa6e925a418097d7827551f81cef6e801739b3ea111569151a62ef58adcc1af3e9a1efff199e4207c000c0c5f1642665e98842575dac61132518ec9f6 SHA512 fd3f02ce39380673352df852010c657ed315c3d3a43089e060e37fac2e172368573c02fadaca3269c41a2be35c8a09d9eb2c44b4c03e21d8f01b31cb1c90c066
-EBUILD clang-9.0.0.9999.ebuild 9531 BLAKE2B 339c3275077f63069f74ddbc3a9b7aa2e1b48ea0677fd18aeb996b414119d4371f5f226a1e248e10919e798244a7546c557e74fe4170bf93d69e2b502743bf80 SHA512 4bf2f4ab2ca5ab62ba2795089cc9c329e59a1a9c3c3094c770120d94625be74ced3f135b33b4898f69866754f16f6081b76169e0172a80a9ece3f9b07d0c83fc
-EBUILD clang-9.0.0.ebuild 9988 BLAKE2B 88cd6857f6ea4ae9ad4202f611cf9f42c98844ac54bcf3b257098d0f2a937a76cfb8c692e7a43ef9f0505e75e6dd1c81ca8b38f2d43918587a2c785e84ee533c SHA512 e6a9b42ce02d386e786574362ac5dc9e820918e683b44384bc67761157a904999946a9db07389248ee0f6fdd786a368265acf3b31a7e22f53a828ff3a2c17b0c
+EBUILD clang-10.0.0.9999.ebuild 11554 BLAKE2B 4a5f81509bd9ae901436e3a834fb2dae840f84655e1f2f792922ba276f0139db665e07f85de23c5bcecb68c80f57442c7766ff7a9e74e2bbe68bfc15f2b45d9f SHA512 517816a43844239a3e0bf7f81ab30b078f99f238c298d6b83a282f10eccc28faf2f82863980dbacdb53942785ca9cd82414d105332acabef065043547d8bc776
+EBUILD clang-6.0.1.ebuild 10260 BLAKE2B caa01b8f386069bccd3bc003172b158cb4c82ceb0014cb22c4065f0b8fb257c0a1d418f94b680b86e6386493d68f0192d6a357e98120daa4014283b627394aee SHA512 0efc198053d9f828ef0cc506f3ea731f0e440f2433dcbe3da59673fb7cdb33e746620515585c6d866304087038ce1b70b4b9f35be3cb1cddaf5f413d58e74891
+EBUILD clang-7.1.0.ebuild 10342 BLAKE2B bee118a01e7f6a123406d809e3e87f8f14bdac8060ee9cf0bbd21c0ab99493d215f057d42ce1a50aabab4faab15f5d79313e2123c2815c9346263231ddb18430 SHA512 924d9a98c439918cb1f03da5cda2b87dd412032209752aeaf1e1a69d5bbf8c01f403505681f43c8a08b731aa8a644e35a754bb18624da4d8e4ca5dfebeb17a18
+EBUILD clang-8.0.1.ebuild 10240 BLAKE2B 564acf26ff06469442f634c60cf2ee887f13f8d720f6ee9f104f84057c588e56b5b1e3bd0e3104eff4f25b52d6a69467b95e8f409e67be83887ef41426e8c33d SHA512 fd367c55c9a9f33d765e7d520806802b7e0de6e61eda33b46d1a5a24906e4c6a6295b2467c82d6001db6519be2609097f09ddb11e4b14165a890d85cfbb1ddb0
+EBUILD clang-9.0.0.ebuild 10156 BLAKE2B c2680af0efb87aca3b7b549df42ea1e8d84a3c7df66f71a3b3d63710f8182f14ae744ce8a51bb1f6eb24564a88372d96a517620cf72d87188cb0cdf23b21d740 SHA512 e0d64fc75df9bce9727f825b6cb197670c950cc3aea68a8d1566a86818c912a8ce9bbadef52d1c671a7c6dee307deeb9662e6447f9c55d5b5067ebeb910cf38c
+EBUILD clang-9.0.1.9999.ebuild 9531 BLAKE2B 339c3275077f63069f74ddbc3a9b7aa2e1b48ea0677fd18aeb996b414119d4371f5f226a1e248e10919e798244a7546c557e74fe4170bf93d69e2b502743bf80 SHA512 4bf2f4ab2ca5ab62ba2795089cc9c329e59a1a9c3c3094c770120d94625be74ced3f135b33b4898f69866754f16f6081b76169e0172a80a9ece3f9b07d0c83fc
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index 88157e2c8865..aa2c3a2ba5d8 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -21,7 +21,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/clang.git
 	https://github.com/llvm-mirror/clang.git"
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
@@ -104,6 +104,126 @@ src_unpack() {
 	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
 }
 
+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}")
@@ -114,7 +234,10 @@ multilib_src_configure() {
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
 
-		-DBUILD_SHARED_LIBS=ON
+		-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)
 
@@ -177,6 +300,8 @@ 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() {
@@ -249,7 +374,7 @@ src_install() {
 }
 
 multilib_src_install() {
-	cmake-utils_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)
diff --git a/sys-devel/clang/clang-6.0.1.ebuild b/sys-devel/clang/clang-6.0.1.ebuild
index 1fc78008da86..32c29fff2574 100644
--- a/sys-devel/clang/clang-6.0.1.ebuild
+++ b/sys-devel/clang/clang-6.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/clang/clang-7.1.0.ebuild b/sys-devel/clang/clang-7.1.0.ebuild
index 53f44663c4b8..acd373adf62e 100644
--- a/sys-devel/clang/clang-7.1.0.ebuild
+++ b/sys-devel/clang/clang-7.1.0.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/clang/clang-8.0.0.ebuild b/sys-devel/clang/clang-8.0.0.ebuild
deleted file mode 100644
index b06ed7f3a681..000000000000
--- a/sys-devel/clang/clang-8.0.0.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic llvm \
-	multilib-minimal multiprocessing pax-utils prefix python-single-r1 \
-	toolchain-funcs
-
-MY_P=cfe-${PV/_/}.src
-EXTRA_P=clang-tools-extra-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? (
-		dev-lang/perl:*
-		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	)
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${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} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
-	# add Prefix include paths for Darwin
-	"${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
-)
-
-# 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
-
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
-
-	mv "${EXTRA_P}" "${S}"/tools/extra || die
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/lib/Testing/Support \
-			"${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
-		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
-	fi
-
-	if ! use doc; then
-		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
-		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	eprefixify lib/Frontend/InitHeaderSearch.cpp
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-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=ON
-		-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)
-		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/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
-		)
-		use z3 && mycmakeargs+=(
-			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
-		)
-	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_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
-}
-
-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() {
-	cmake-utils_src_install
-
-	# 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
-
-	# install pre-generated manpages
-	if ! use doc; then
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
-	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 [[ ${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 "To use these scripts, you will need Python 2.7. Some of them are vim"
-	elog "integration scripts (with instructions inside). The run-clang-tidy.py"
-	elog "scripts requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-8.0.1.ebuild b/sys-devel/clang/clang-8.0.1.ebuild
index 3dbe5eb763a4..63ed45a9fbb5 100644
--- a/sys-devel/clang/clang-8.0.1.ebuild
+++ b/sys-devel/clang/clang-8.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild
index 4a4b325876a8..2eabbee087ce 100644
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ b/sys-devel/clang/clang-9.0.0.ebuild
@@ -35,7 +35,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-fbsd ~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}
@@ -73,6 +73,9 @@ PATCHES=(
 	# fix build with gcc-9.0.0
 	# https://bugs.llvm.org/show_bug.cgi?id=40547
 	"${FILESDIR}"/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch
+	# fix silly test failure due to '.src' in path
+	# https://bugs.llvm.org/show_bug.cgi?id=42979
+	"${FILESDIR}"/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
 )
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-9.0.0.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
index 848de712e241..848de712e241 100644
--- a/sys-devel/clang/clang-9.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.1.9999.ebuild
diff --git a/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch b/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
new file mode 100644
index 000000000000..250302da8e4c
--- /dev/null
+++ b/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
@@ -0,0 +1,35 @@
+From f18d747107de3504ceac73abc1ec351fe8f58c95 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Mon, 30 Sep 2019 23:42:17 +0000
+Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name
+ contains '.s'
+
+Reviewers: dyung, rsmith, hansw
+
+Subscribers: mati865, mgorny, cfe-commits
+
+Tags: #clang
+
+Differential Revision: https://reviews.llvm.org/D66176
+
+llvm-svn: 373275
+---
+ clang/test/Driver/modules.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clang/test/Driver/modules.cpp b/clang/test/Driver/modules.cpp
+index 7c549c1300f..4f4e3a41400 100644
+--- a/test/Driver/modules.cpp
++++ b/test/Driver/modules.cpp
+@@ -15,7 +15,7 @@
+ // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE
+ //
+ // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}}
+-// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}
++// CHECK-COMPILE-SAME: -o {{.*}}module{{2*}}.pcm.o
+ // CHECK-COMPILE-SAME: -x pcm
+ // CHECK-COMPILE-SAME: {{.*}}.pcm
+ 
+-- 
+2.23.0
+
diff --git a/sys-devel/cons/Manifest b/sys-devel/cons/Manifest
index ccb7054411bd..de9e25ee0445 100644
--- a/sys-devel/cons/Manifest
+++ b/sys-devel/cons/Manifest
@@ -1,5 +1,3 @@
-DIST cons-2.2.0.tgz 200338 BLAKE2B 17a4c5a7e23f2b49ae313066315b69dc6795d0f32faacd7318df31210768020f3b75fee05778cfd5977bbc080f51c13d114c90e7f4402d801a94ed8a0d908a39 SHA512 93b75e293bcd8f9a8ebb4c5f77ec07c72d82493a896e8858603d32f006e7ac7fb8164e901a7927963f66c7973519b1bf2551a6c7ee9c5da1c4e6f61df8bdce7c
 DIST cons-2.3.0.tgz 235895 BLAKE2B 766b00824ede528c5d356eda40d3b2929b472720340c0f85add95ba13a5b172afaaa50c779e664cca1b5e74f9ed1d26cce8405f7994d9464a0693e5828963863 SHA512 a42b7537fa8c8cc179ff9e608e6cecfaec1ee0b2e1efb9b9b5992ced15867ca05155e87221e5fde6d912b94eac0d1a411c7feb528e882ed65ce9fb2a2d46be12
-EBUILD cons-2.2.0.ebuild 568 BLAKE2B 10b1c595bd744495c94479f394267e27fc50521f536a23a4a2b94b05282c5aa7410554ab482acccf94a3c3292ffff395ce879f45bed03ac36c5dc58bc255720e SHA512 04176c649e87f075d6964b023fc79b28d90d81420a5a08831b42173ac9a179cc7088901fc01aa9cd09194b266567faa77e36f56559dc349b3ce2e7ff60c5fb28
-EBUILD cons-2.3.0.ebuild 622 BLAKE2B 74ab21c57a6c8a25a893104fab675ab2ef3bf7999c87419e88253b19b6b06ad36f38e14c67ad0de60bb706d82f3a2a3d10eb23549aba8017f6b7ff4f5fc88018 SHA512 9d4b3aabc6f2352143db73320c1f189eda9513c98b80fc75f6194bfa820211267a116f83e44d3c58b901f7410c491814e25f6381a65bf8312e2c88b3da924f90
+EBUILD cons-2.3.0.ebuild 617 BLAKE2B a057a4016fdb537156bc5a566e5303e426ae96151ee4925b5e29d16efe8327b58cd449124cdcee0bc15e415cc869e0db73d6d3e5f55be890e5f9c6a7034811eb SHA512 ae3e18ce931dec640043a0e0f44a0977924aeee97eb1d17b67e71e97a7dc7ed61908b70e6e4f4809203bc084d651d49147976ac6650e701fa0829f7913dae86f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/cons/cons-2.2.0.ebuild b/sys-devel/cons/cons-2.2.0.ebuild
deleted file mode 100644
index c2eeeaa5e642..000000000000
--- a/sys-devel/cons/cons-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Extensible perl-based build utility"
-SRC_URI="http://www.dsmit.com/cons/stable/${P}.tgz"
-HOMEPAGE="http://www.dsmit.com/cons/"
-
-SLOT="2.2"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	virtual/perl-Digest-MD5"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/emboss"
-
-src_install() {
-	dobin cons || die
-	dodoc CHANGES INSTALL MANIFEST README RELEASE TODO || die
-	dohtml *.html || die
-	doman cons.1.gz || die
-}
diff --git a/sys-devel/cons/cons-2.3.0.ebuild b/sys-devel/cons/cons-2.3.0.ebuild
index 257a401a9a8b..717660db880b 100644
--- a/sys-devel/cons/cons-2.3.0.ebuild
+++ b/sys-devel/cons/cons-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.gnu.org/software/${PN}/stable/${P}.tgz
 
 SLOT="2.2"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index b0d8e0302a19..a9b3d857d750 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,11 +4,11 @@ DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b6
 DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
 DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
 DIST crossdev-20190908.tar.xz 27216 BLAKE2B f756735108c257b5070031f60f39cd93ce4d146e1f7d0e33df40384033c92d545f11b3aaf7b6313fa3fc402af6d0daa8ec0dd1e0aadb42a9a2f23b05768fbcda SHA512 70fb3a5995c284745fa4aae5844c368e7b8f5190a9ec15384b1db455ff6202bf88e33e16ededb6d127f82bab0aa1d0fd859652c8d4907e9cf7f4e7c95bdfa540
-EBUILD crossdev-20181020.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
-EBUILD crossdev-20181202.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
-EBUILD crossdev-20190311.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
-EBUILD crossdev-20190712.ebuild 860 BLAKE2B dbd958904546375349ac0ea43abc0614cbddc0ef834d9134ebf4a70fcaa59c62f13cd5ba1d5687fac9e6f4ea33cfa5fa99dcfad1e1345cbbe7e34ec56f9c4857 SHA512 9cd21e0ad7c5744226e75931e9c3c0fc3598ad8e3c015042418fa65007ea21061b91a698622cc806a53c7d8ac26fef28302ab5c560356896cf3ffca900209948
-EBUILD crossdev-20190901.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
-EBUILD crossdev-20190908.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
-EBUILD crossdev-99999999.ebuild 879 BLAKE2B 9ac2da81d2ce3e295b1ddf9b4c5febb91718a37badefcadc32c984523169a455001e14d591d4873bcb3e691fe4b8b532c45e379935de71d573aef47b438275a7 SHA512 f3420056b96dc3bbd175638eeb4cd16779d8676db61a25635d60533f9f1d08ec434e4e70e8c00001eb8a961bd79aa3b50d20729c2cddf14c4225fe18d801bab0
+EBUILD crossdev-20181020.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
+EBUILD crossdev-20181202.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
+EBUILD crossdev-20190311.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
+EBUILD crossdev-20190712.ebuild 850 BLAKE2B 15de7dd52f3a59ee044065377bb0cb5645f8ff8d91cfe0e8602b609092e0c35e633b8569449a9ac991d704116cdea7dcd5a636e35ccde9b71b55c8da8c255892 SHA512 7331ed3ce7351a98d7a3b57a30038034156bcd1be4ce099c88e046f0cbd31030fb1f654edd47b674f412f0eef60aeb15e3689fdaccb47eaa54505c013995efc6
+EBUILD crossdev-20190901.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
+EBUILD crossdev-20190908.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
+EBUILD crossdev-99999999.ebuild 869 BLAKE2B 54e873c24ced58363ee60e17f9c8fbd9321302842928795a3e80a42665e73191e209b6f05574aa1b33134e02893d91dced4e9d0f7588d0a1f21d438549cf070d SHA512 63a9f99fb197ff45c5c059a6edb39e07a6eacddeab8f0a2264e6a46ae4b685d6821586d50d1962509ffc394db24a956948f53109b49ce0821db0ac3764d38d72
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20181020.ebuild b/sys-devel/crossdev/crossdev-20181020.ebuild
index 86917ed0f594..e97cebce0df2 100644
--- a/sys-devel/crossdev/crossdev-20181020.ebuild
+++ b/sys-devel/crossdev/crossdev-20181020.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 s390 sh sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20181202.ebuild b/sys-devel/crossdev/crossdev-20181202.ebuild
index 86917ed0f594..e97cebce0df2 100644
--- a/sys-devel/crossdev/crossdev-20181202.ebuild
+++ b/sys-devel/crossdev/crossdev-20181202.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 s390 sh sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190311.ebuild b/sys-devel/crossdev/crossdev-20190311.ebuild
index 36e054f04b26..ad51f67caf6b 100644
--- a/sys-devel/crossdev/crossdev-20190311.ebuild
+++ b/sys-devel/crossdev/crossdev-20190311.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190712.ebuild b/sys-devel/crossdev/crossdev-20190712.ebuild
index 81c40d108dab..5925a2498470 100644
--- a/sys-devel/crossdev/crossdev-20190712.ebuild
+++ b/sys-devel/crossdev/crossdev-20190712.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 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190901.ebuild b/sys-devel/crossdev/crossdev-20190901.ebuild
index 36e054f04b26..ad51f67caf6b 100644
--- a/sys-devel/crossdev/crossdev-20190901.ebuild
+++ b/sys-devel/crossdev/crossdev-20190901.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190908.ebuild b/sys-devel/crossdev/crossdev-20190908.ebuild
index 36e054f04b26..ad51f67caf6b 100644
--- a/sys-devel/crossdev/crossdev-20190908.ebuild
+++ b/sys-devel/crossdev/crossdev-20190908.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 88ffc0b90b9e..b36661fb51ad 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index ebc38239c2c2..1105587cb5f3 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 1890 BLAKE2B 72c4d6ad3f50d6e32dda2dc12594b3d21e3359e3455935d08219a521dea6fd6827007ef529d6225e7bb446a876f25a89ebd346f72792de8941df180d06ec52a0 SHA512 651d05e2dc7f6222c2256d08b6554ae00ecf6a46b82f6b05135f981130010be909d1e77e6f7b102d88904daa46396d6a161193e911ecbdf873fd7fdc0e8793ba
-EBUILD flex-2.6.3-r1.ebuild 2038 BLAKE2B 1d76e9f182816a752856318b21dd4c514b2a5b33dc64d6ef9dc7358c366eb97dfae8bc4ed9f51a10f3176c8c46691fe076037cdf0e63cefbd1aca7f3544ad108 SHA512 ba1d1910696219727c2ff15ef9a6dc0b8dde4ccf288ae40963903ecf559f638da0f4fdfe7ed74c0ce82c5856f3fd61b4963ccb5951e97ba9afcbc7e412f42b31
-EBUILD flex-2.6.3.ebuild 1964 BLAKE2B 33e4eb6b09f44af969570b4b1614b74921f0b9232702d1a18d0dbf1af8ccd8bfe5f8f721d8c9b44e8cb1c0698b137ceb22d7b56adced4e6cbc0ab21bfcbc7b94 SHA512 cf2394930e7c81de5c81be24023d26bc313097b67efc73f79ccb8fe4c927054b495b1eda6f0e07539132e8d41438c4514ea8a8fc3182a4a80ca25c94b316cadf
-EBUILD flex-2.6.4-r1.ebuild 2079 BLAKE2B 9e1d8e718827b1b105fbc7f3e327d4ed70d373ab6513b419e4458a15f5339e5aa590a13cf7ec5b6cd48a28b96f24a54ad79e17c7564b1e1d2635a6482eec27cd SHA512 d58fdfb033bc3d89583e3419661ee21610e1f066dc4cfadae75a6edeb99a5a927f1aaa42f72ba5ce623a4f99c6416fb800ba711777f05641775f643a5b4f2c2a
-EBUILD flex-2.6.4.ebuild 2003 BLAKE2B fdac6604163d48cee3d5491f2f220a0141102a6c460131eccde34aab0f1ec2f866c80ff9888a6b3af63f6cdf5e7b5aa9965d83a51ac240b8d778321f18cc8b10 SHA512 0a771f1e612f2b383fd571485d5e8a7da9d08230f60c97edde60894a183270dafd3f753a3d47dda3450c63da8d416842f8c2aa7e35d241063625e3e623d26e9a
+EBUILD flex-2.6.1.ebuild 1868 BLAKE2B 901b535a1ac0a00f6ae5985f18778aa9b69b9fd85a521d28a56b11980c7130284d0b944e89e2750390a4bf8025fbd4acc35e4a3f2153126bbe91b38451aa7de1 SHA512 bc4a9fa82ecb865ef211166d443bd5c7424504b074409ed64117bc8517558372755246a16c5bbd08bda00fc5d75dfbc7c637d999287ee0d1c21902299313bc1a
+EBUILD flex-2.6.3-r1.ebuild 2016 BLAKE2B d37979aec4a88d672bbe2d433782e4c91b61e482cb2a8c6f21a6a640f7e1f4c80edeffcf5b5bd53e9ca7fa448ff4c4235db9450676f9735894e66a35e7e97f59 SHA512 cc34d993eb614fcec4f62b534343e5c66973cf1226e648a9aa70bad8b1e660950b0fddeac0a921a9d9821ac56a7b76ccdd6020ce1dd98d701fd08fad737e4073
+EBUILD flex-2.6.3.ebuild 1942 BLAKE2B 93cad3b261d13ed84c1a5a9a21e714a28fc15bb9b211e432ca2c36f10c0a80377c4b518bef064c422578765303eb50c0933c34aa2efca10598f19aabcb95fc86 SHA512 8cf8186b456841866c44f50701e8a546b37730c990305d7e6e7401dec1d9fe189fedf51b587dd25a8294009ee0a508d7665f8be7119df6702efd5b2aea921fcc
+EBUILD flex-2.6.4-r1.ebuild 2057 BLAKE2B 4ccf798ac5838bb4674eff692ed2318ade4e0b716f38f88e5367fd979216522202a35064fbb68f44c69ed06da623985423a211ab00040f053b3e45043dc3e1ff SHA512 64404f3d22d7ddf106744ac44dcb159f960499dfc0b8018f1e7de544fb4cfc69f7f5000f2a33426e92be186d15d51769846f54d3c2c164b4a2a96e6f0bdbfd26
+EBUILD flex-2.6.4.ebuild 1981 BLAKE2B ba845e4c1e4b0913f359a2563d3648434d392939188abf6f4a3cba5e989d181451c10bdc233c837c568f59401c12216bcf5fb75083df4f261ceda34bdb4d5386 SHA512 42cc088f3d9504fe3e0912244d987026caa9c187aa2816ecc2888b2f2d9f75182e964c0481fe8bfadb47139d4b899e850f963c1d7f0beee40a49c4dfdea6fbde
 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 2e215d2cec5e..ea2654c2a948 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-fbsd ~x86-fbsd ~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 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"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild
index 0388ee0732d5..fc2f132f8480 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index ac7909b9ac95..97a289f17801 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index b38ee30c32d7..caa31dc2a83e 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-fbsd ~x86-fbsd ~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 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"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 10a615880b65..04b4927aad56 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 2a9a73023222..a5c824aa3c47 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30
 DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
-EBUILD gcc-config-2.0.ebuild 1208 BLAKE2B e30bce3cb658560c82662433eac8c6c0cc162eb68f47bd9ac3d75915c3a14f743b22b443a7022efc5261c28fc7cb0ef5890df90c0fea1bc5882e028b18ca9fa6 SHA512 ed202ecaa285fe76327382ad71dc54eb1093888302826e1d968b279bfc7c9dcbed121409adcc58b504e6e55b58603b651a336b6abdaa8a449b9d73204ab2fa2b
-EBUILD gcc-config-2.1.ebuild 1221 BLAKE2B 1fb823effc6eafcf213e0fb339c8ac220c68163f5edb8683d4a7db3e9d900fb0ed91b1b68de6435e9cf463a2674bda265a6467c981d3b4b9d92deb75678a05b4 SHA512 a764662594c1fd62eb1643f959e75466375dda1bb0c3b0f446565306f8c14abd7a2f56708fcfcdb13a39452178207589d4bb4972d54591b34d6b0502500dcaad
-EBUILD gcc-config-9999.ebuild 1217 BLAKE2B 57f7e9aee9f4314f819d9ba81c7007231373b25154721ab9912ccd94a927a22909a08fcd0d358b89fa1f381dbf3c4e57922a758007df452688cf367614a86ee4 SHA512 e57bf24e35e5075d325f17812f78d4c70a060013aad75955c266fd8cf56ed4c39eec4574a3b680d44911a2ac4673e921b2744d151ce4415c1cc192247d004f6b
+EBUILD gcc-config-2.0.ebuild 1186 BLAKE2B fe7ea688690f81325439d65df9e80767771ee688189fdc368097fbb62f2535aa11ca52e25d8e5caf493083d14f149d5db10402b46f5bcbd624ee5999720437eb SHA512 f5ade89b8396f00d37d3608a9b94dd5db41e31b39250581a78ba95cf9654c146b5b4a947ff9df313a0e9786801c1d0d43763a51a677f779457c838b691c42c8b
+EBUILD gcc-config-2.1.ebuild 1199 BLAKE2B a2cbb82d96c223a1bc0a28139dcb80a05a077bfb21c5de1ebfcdfaaca224bd8578118feecaf34a02fec5479ddde1c1dcf8459fb5b24cface5d99ec8b350f3d76 SHA512 7f3f56ad34e675cce6941283abf8e9010a2aeef54731d071fe62521a839b3a2e9d7e97f2c6e8749d5c1a77d7998b1967afc4f078e9055e8c6486283d5484b873
+EBUILD gcc-config-9999.ebuild 1195 BLAKE2B b5ec2af87244bfe98a13861e0114c12c72bf0adfc656e53fc425d88adce6c32700079ef5e03d469a0eb87bd77add159b5d453eaa2a6866deea8152e1fc38f842 SHA512 26bae4dfa89fcaeca9d9600eda7350b7cfec9239b9529b5e1cbfeadb2aef9ca2049a1253c306dfa09c7509c6dac806459250bbe3dbfd0c53ab684a6f4448c95c
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.0.ebuild b/sys-devel/gcc-config/gcc-config-2.0.ebuild
index 2b2bd5117da9..3e0098e7f4d6 100644
--- a/sys-devel/gcc-config/gcc-config-2.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.0.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 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index fc7dbbda8a1d..d63b5087484e 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 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index 22370b52cc52..f79e8cf5bc76 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index fbc27f86d720..db56af2d7dc1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -110,53 +110,45 @@ DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330a
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-3.3.6-r3.ebuild 1247 BLAKE2B 992f97d49a929c135ca42281a721d8e8dc79a9ce01a61f7a3c2b6fc343361f02da0224ecf90125b9fa8359b92efa401cabf60480fe3fbd1378b1590b77a5180c SHA512 fe11c6ccb51f32c481b6bdeaa40a9723d290b6ba1a3ad27c9da79ebdb1fea2c4cedd0aa97d989758c4e099556968590f716148c27ae18b0955433d624734c11f
 EBUILD gcc-3.3.6-r4.ebuild 1244 BLAKE2B 0d44b62ee7257ee60b47e83354713fdf8ae7aeb742f2923b9454a4bf41a274f2de6a5cb6d5e63569e94a96c0bab3f2020ad8c7f4a48c2bb879d29b14a54da19a SHA512 cb9e5fee43681e6d340b99e27af390cd9df0c06ae655895168c19247fd129a0159f5a4d5529716515838d825da2e8c175259223d2512810e9cbdbc8f0a0db3e7
-EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
-EBUILD gcc-3.4.6-r3.ebuild 1378 BLAKE2B d11152c0eae119ac4a3e0d4ee6624c73c921a04c3a4461e80bb9a8ae1cf5a5af6d3cedf1c0ed6557dedbd0fe55d4b3fcf3d68ec88e219a058d2ed4a5150d8bd9 SHA512 18a5dba574d47b571c5217922a0b93d13f96e7dd02b29005529031461360d89c9404340d6ac7880e7b42b80d7cb8b52b6a97da0e5394212f939e6fafd564f0eb
-EBUILD gcc-3.4.6-r4.ebuild 1376 BLAKE2B 02140dccbf162fdb3083163b56a72df88d8bd8fa0ea64064f1aea9b581d846e7ba6f06155dc31e9543f906dd11711c03ba13b12921f9d7e3a3e65dbfcf050e9c SHA512 ea6be02a7778903a4a5f90e803b4e32cecd0ed2dd236d803f585185f44cce277add397d804b060cdc29ab82a8da64309ca70cbaef8666504df01054b18342e08
+EBUILD gcc-3.4.6-r2.ebuild 1364 BLAKE2B 5a8c18766b666047252f0dce63999e3deef64175f3e0054ed6f05de22a325ceb0f89f39ca54165153f318d8746dbcceabff0eda526bdb9dbca8331d2f3046a22 SHA512 4bec661f818ce0040a51ec4a0392353279e32861b44bb61dd034fdf2c819dac65e8ce13f45bacf30b5eacc18f1effb6060336323a9f47c0e41cc1e59af87d52d
+EBUILD gcc-3.4.6-r3.ebuild 1368 BLAKE2B 351d16d2077170861f8ef3a8d94958d27c1529e0ab0c543a134dc818542e84da21f65b78669e6fdfd2a9aa7e43b5f837de722ac70d69f6de8ea2773cec0ab7d4 SHA512 6131b84a91091e3ad0c3335442261f95c84f39b3da6cdb6a6d06e3a771b37e7f3ad322d5c2317935098e509789211f8c649b408a726fb19f0669f7976cc88b83
+EBUILD gcc-3.4.6-r4.ebuild 1366 BLAKE2B 339ea87ce3f6d3a727ba42db090d5721968757900cbe6008cd9739b8bf3c886e4771d00e870f6f2f9c759338d5b9787681bbae2cc43fe23e061f75376dc02c2a SHA512 2326666a9d4e98527c1db24d7e0c1320aa4225464bee5ac672e2ca8a95c0347133201afba333b7ed40f976c91c19c14b121853af3da5927829f05ad4b0b3a297
 EBUILD gcc-4.0.4-r2.ebuild 244 BLAKE2B dfdde3b2f9a0ce404c006be81c660911f6f8bf1ee0705b8675d371905bce310ef712bc898fec7ba02c53a45bbc6868334405a71029104449966ee3cf76e26841 SHA512 b9738da5703eda3e2c2e33bb456549be9ef68e4391cc880b5af8b2f173cdbdad874f609e90fa38547a3ef53657375c0bb8d377bd70bf3edb89a3e30264e7f180
-EBUILD gcc-4.1.2-r2.ebuild 655 BLAKE2B 3302cb25ba09947d7ba702446e24d0b62e01fdf7ee77d4adeb693926f9fc2df4804f9f22a113be0916e9943afc2bc92fe7b01d2478e16b627dcfe76d5afcb997 SHA512 b24aa6d3b774f5994bbf7139682a1a14b2056a2c88c4ddf385cd3473e1e6de03631644348b4a279dc02634acc6647f116e3789a26421091cf91a0750a1897252
-EBUILD gcc-4.1.2.ebuild 649 BLAKE2B 70c041237a0852fd3ae427244b7ce6eab2773e61c9c9deacaa0f6a6d2d3ea3c3035179bf2d2595b8949b6397c93b258f9bde69f9831ced1c95c87acbca485f08 SHA512 894bc80ed2b4a72f53f059962a4985e27c5e809744bcf83d9d27a5ef1bbf999099a5d36d35da2b2cbb5f511d26c1b756a76074024e4866a5983bdf7e0a28740d
-EBUILD gcc-4.2.4-r1.ebuild 394 BLAKE2B 0798e2523d59723a892cea76ad338357b1a83c6d61b3cd1be9d6926c00740f99b8e0466b9740bf2db44655dcbdeff488c9351411a691fa844f3a77ddbbeb9f3a SHA512 ea93dbe7d8e21ff9b60c9fd67b70fad4b90f4ecea98a0359d0a1d477dce866c78979c2a535fd4638d19b9ad990cb2985a3a64e179aed6e301cfc7fa8c7cca00c
-EBUILD gcc-4.2.4-r3.ebuild 392 BLAKE2B 940f8f015f571fa25e00453127054da76c38958eb7c7320e21a15210132ba686c8c67dee45e0601287792cccd486d99c86617b5470bfcea2749744f7ce6ace7b SHA512 99ab8ca59a1746caa722787b12a44b82379d9b0be4a9a546047ed3522f4cd096f60a6c4effda77ca92359dc8501bec65d606e1d46d22e6e811da46c61fc6e036
-EBUILD gcc-4.3.6-r1.ebuild 630 BLAKE2B a0f9f25d48a7b3abe6e377c12ee3ff35c585b6c5619679d465dd67cf7107d8fabef98c40c2f62a3f27029b43095055440bf6340c534906e31403041e334bd2bb SHA512 d381b460bd995fa8e5f8ee7464f04030510f21d569ab539a0bb6afbe2f5f4266af25ea8df052004bfb56155fd3f6cdb82fed7431c36da0f658549a26449d1e55
-EBUILD gcc-4.3.6-r3.ebuild 635 BLAKE2B 82df9ea727d2421742adf043da0819f1e0f6c622ab9758e5aafc3e30d332e49eb34a6f06a815ae49c5d4131ca549da7a4b91abd8f21ae1f2e9d4e577d340fb99 SHA512 c05e9a151b56cb93a3e85f0f05e0900fb5ee3d0f5de54f76f1dbc0aa2f04e55dd145e3363bddad90100b4261bcbb478109beb31301618e02c9c4db7d812f5ee2
-EBUILD gcc-4.4.7-r2.ebuild 680 BLAKE2B fb3274a32fb75e2078034ffb605b712933855858c8c43c89ffd6621beabed31dd913ebbf417c58c04f5a7ba22633213fea6dc7c045d6e8ac9b43dcb40c66a2a3 SHA512 fc13dc76ca642580b7ed4aee4b97cb3109b531448265420c845de074d19964b36fc081aff5215d8106d5a56b25d6610eaffe6a3152b73e29b71820490c5c6b1a
-EBUILD gcc-4.4.7.ebuild 674 BLAKE2B 9f2b3b4d27620cdbf5f141f38709cc37f04d3e822f58b02bc3f784e37f1b9bf550a5ec9d80e646a37f2cd17f315b5e51b008257f9e5d81977e8985f88b328667 SHA512 72e2eb8e125e1dd8ff095a989a739978562e77432a949839eb012bf915af4e989c79759230583b80580d25b2659cee937359f05f96cd7dbe5084d4f7bd3f96d5
-EBUILD gcc-4.5.4-r2.ebuild 693 BLAKE2B f12bdae02e413e68a6d4f48702dfa25d8d4f5922e7964982b0eecf3cd3bda7f555d2f34fe00543a8899cc349ad0f2522bf2c7e00abb3016863c82d44c25ac0ab SHA512 b7a76fcbd4baf563ac20aca35779f88d3905051e96e50d2eaf1a80c68ade7cfaf436c04741afe1ad7aab472fa8a5f21b7bb9733d5136eb7d65503600d81f6abb
-EBUILD gcc-4.5.4.ebuild 687 BLAKE2B 0cb42fa794ab8b1e4dc8075bddc288f888e6f79ee6d93aa8b95faf1b3befb9049397b8e9583b10053a2e7f1fe1af2e81104cb7aa85327da9a72e0cdd7d43b02b SHA512 2f4ac3fdea111450adbbde5b3021b97db273baa1d2ae9188ab95baa772a696843c2685ce51adb8dc408ebf0924670eaf7b17c42bf1f798bb23d3037ff951e456
-EBUILD gcc-4.6.4-r2.ebuild 774 BLAKE2B 106d2682855e5c6c32163bc29bc462bc782f4e3a5df49417822010d24f03d797a5ae4b5ec6421b9f2b3f5018b86bc91b3d97803ea6d748ca22ce8f356f595f39 SHA512 604b9bb1388e4e0002b985d3d6d15af8502eeb189548c39b70cbe86c5831fe676de4b0e6fae6286f056648b099214f985026b68e9e80534e5cac74022a21eba5
-EBUILD gcc-4.6.4.ebuild 768 BLAKE2B 9f38ecd86d75d9040e3674e4f33cc71e070c43d33a984b24e01e830d642546987dac29213534400f7c70890c86120bb95b353ed34bd79160539cb263fecc13e3 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5
-EBUILD gcc-4.7.4-r1.ebuild 1291 BLAKE2B 960d5072a4d03ee507cc5f7ea57f272165378daba273ec05e625dab2c38b0676f9261e46e6733649a49dc2dc50227449d480c90f8faa7af35a4cda8c2d4d7277 SHA512 44882746c9ee2920073722cf2847e717c412672e89656c6ee84e44903e935d0a84c6e7fdec327fddc8ba95cce1b8690d29847caff220f571e7d81dd556674b25
-EBUILD gcc-4.7.4-r3.ebuild 1300 BLAKE2B 68d517adc49deef4e6fe397464117d58f8b3853249e4ad75198a7ef7652b4179b7b990f7132011502408d57a56fbcba260bcc33fbabb70bba87e7f82c38ad200 SHA512 042e52a0d943e36f6f7dd84cdbac6bf3cd7fad0b488f6a80d676719b3372bec2e0c9abdda40e1c05ce7afcece7b24ab2b3ac36ab455b38a03109c870ff851357
-EBUILD gcc-4.8.5-r1.ebuild 1401 BLAKE2B 669ceca836569aa02247049b00d1beb820b12a8fd08bc8da703b650a01629bb6b9b9607d83152889770cc7116a2ce9e058db7d5eee5e91921ae2342a32890c40 SHA512 22f68cc6733b59e3d4f43df088fa0440ebbb40c3cfbb88e538a1ccca849f1111a83c9a2cf0d0733eb16eec956e65c5accaae1c6598a8027a497d20f3293a2934
-EBUILD gcc-4.8.5-r3.ebuild 1411 BLAKE2B 0e12458346c9ec6bfccf6100187472c1dcd6cf0459d3e426f87ff538a695ac1e078f46ce2197d2834ee4eee7e54c1fdce9dda39676ae9858bf60ce38d7ba0bc2 SHA512 f082c4ed61cc6974f5df3dcb6ace113c41aa81608c1405b62a6dbbbd526eb55ab0c4e020e85d82a33de5078ca506020cf3f3d34a8eb12585b3633b00561c340b
-EBUILD gcc-4.9.4-r1.ebuild 1470 BLAKE2B ada75cf169dbeaa91ef7b6e2350e2ae2e1d48ec0c6295a937114437dd682d48537bfea81b1433e4207d5b14094f002f62b736c73f8ddafff5a90e21f63b1a3e3 SHA512 e551c428f54ae57fbb5b2ae9d17f312b5848161a936524add7523e412287c044493a574029fdf7101ab70b44ba4a9062229dc76d9c4e93595b8d7099ae041e49
-EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a8786c7482328cdf4b0d7ab8a10045c2479b3ecf602ca934796e9c32459c9b421a3444a3333b79faf3026d SHA512 c0a443c8c0629b12047f1bdad0b62a23a423f2fad4408b765d5093f8cb2a4ab54b6470f6f4e2b2d4f444817a2e71c11568fadc8d11bfdcc068a8fb4b7fd826f3
-EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B f8246e6904d1d39cccacb972a9e62bebd41ac2df8f45be771be421c8a9905a03486500ac57a8b08d090569eb3f17ed3effad54e337048f1c9ce34f655c86005a SHA512 212b36ca6b5a55855ee91a82ba37c8597d34117a581135ea49ad88b9b7495549e0889a0add86f499208ec27eb81ef8ab786d2ca97d565dd60e6eb09f76ebec61
-EBUILD gcc-5.4.0-r6.ebuild 1286 BLAKE2B 176cf1828d2e8f16cdf1157326103becbb0af36db08f2b4702e25d7732f179709335dd0dcde3afcfc141abf016fd51671b111110d3925b81194e866b4c7abd4f SHA512 807577140b06506ee70e75aa3325a1e02a6f7c4a12c0a79f633b3bb04bdda94de0e9da0d615a1df05bd8829c75825ed98d361d4f3e882b5cdb9cfee04ef10e69
-EBUILD gcc-5.5.0.ebuild 1285 BLAKE2B e0a5bcb01c51b656d4e6f11a8b4894de0de79da2aea5d9e17ea6ce619010244e68e2689923f65fb23553d912aa57f6d55d95688b5b22d4f5c4f1fb878aba4c61 SHA512 8ef8082806d79fb0786c65eb691838cd9735811ed54ed75c9ddc62968bbe5253ca7b6c6dd00bae32608ab076c52e5cd54522076745e6e1e24298b755f1ef5d1f
-EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6
-EBUILD gcc-6.4.0-r5.ebuild 532 BLAKE2B fe0a860235c627ca870340098884f2aa14dc891d00dcdbc5afd81ef2db55a9006d63924b00457fe53e89b81abda549a08aa2b05a665ee2c3f256ba4d7af603f0 SHA512 da5b64937c62801ee0358fa2a6cd8e2b18baf2dd914b8fff644f03e1f6a31b2f788ba1a5633301c2500deefa29ba6f7cce6252ef98bceee20262f4c284213ff8
-<<<<<<< HEAD
-EBUILD gcc-6.5.0-r1.ebuild 470 BLAKE2B 4fea17daab5bdeb872e284aec412ca9a150d70b2bb9c49ff1b4f6bae9cf9628505939b618675d0fb87b7d444230e157fc060a9ce41a9a4e9bfcc8633a27cf76f SHA512 4d3178700a579a38afc6d861133ab1db75b7c045d60b8afa2de1739712024eca8de9b4301c06dd1870f09b4c528d1affa1d88eaabd86677ad9e46ae86ba1902d
-EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
-EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
-EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
-EBUILD gcc-7.4.0-r2.ebuild 483 BLAKE2B 8d75e4fcc62e82a81494297894ac73920100ec1d13a039daafc9a0b290e633e91e8eb7af8b0f8d93ad261387645066314da75a0f4cd7f233dd90c6ceb5861f61 SHA512 160f49984268a4487540681c190f68906561e2cc459ea8df6b7d841ae35ff805b7b070436e434d91355008722e67bdcc54db07ae642746107622a69a3d5f59dc
-=======
-EBUILD gcc-6.5.0-r1.ebuild 464 BLAKE2B 10626c5a86323b2e6296d1886838bda705159ca45cd9f1703428c678825f0afe0d07c6af7ed61954af131f9e55efb5b12485fb678504b19a58c03cb679276869 SHA512 cad65ddd4103904379d692c90f77dd7643cefde53eb65f380fb910601d4e578efeadbfb517b4edd822ef2daceff3fca5ffe97baa2486dfb1e483fa2c72cbe10c
-EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
-EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
-EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
-EBUILD gcc-7.4.0-r2.ebuild 477 BLAKE2B 9c87491fcf792fce171b14f36b203e339e25470bde6ab69fd7387b30efd887b02e5bff5036819bc275a048d8658d50d793d2026588a1cc050392e334072e2d7b SHA512 22837c7eeb5965c3949de57692f98f90ddbf52326358dad37fed410168fb4b04becbe22bc2c3743b81e4a63c71e9b79ec1bbb67af658b745071644db33f91c6c
->>>>>>> next
-EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3
-EBUILD gcc-8.2.0-r6.ebuild 573 BLAKE2B 812f00996ac141562556ec5f38a90d56fc208ab3a6ae19244dc2df90895fdd91568e261c1803ff9fd9fcba564b23068c41bdd40efa0b14fd7526b077663b3ff6 SHA512 27e4fb20f91ab261560a70190ab0127bb214afc776d9b168cdb32482b6d443afec1a6c479cc40ebdffd7753ba14ff66383cce6307ec0cdbef3ef30c1c7234bc5
-EBUILD gcc-8.3.0-r1.ebuild 611 BLAKE2B c6de68f5d524ed9823eadfee85fceba96d10d5f38f30861dd57238b3cd585729828b8ca880c4de07647a0a633db2f3f76eae214c2bd36a2836f550d3e5c77f3b SHA512 4160d6e5927408bae6eb959b202f79f38701d3de6ce264e35997c156e4fd0e9f186bce61d573c3bd3528022adeba3030581aa49dcdf77bb4a3a09184964c2590
-EBUILD gcc-8.3.0-r2.ebuild 567 BLAKE2B e66fd3fe5be9a0e7561bfffd36595437f571eb725a9a30144143c5ac07a339e8f2d2fc15ea146a27270bd8d59115ad4fc61485811d33f431e5ab4d3bfdd5a2dd SHA512 140fae277b34ae3c74a273d5f6db8890d4d3d004b7d6f5737c54452a1a233b26a17477bfd20313575415b4e2879d0d03ae9798127fd9963cd00c3cfc75784103
-EBUILD gcc-8.3.0.ebuild 473 BLAKE2B 0a75d6ecd08d361384ad5d351efef2f848ee0449826b6bb71405f65254beba62d86c3523ffc9fc7bfab7070781bc0fe106014c6fdc29eb15c7a7f78ac68e233a SHA512 98f7c39cb541ce430859e22298225ef9a2fd221c067ce93b736db56e144e699a3b2e85d99187ef9ffeb5fca9fc1ba33737c875adac2dfd098e20f1577d55ccbe
-EBUILD gcc-9.1.0-r1.ebuild 480 BLAKE2B a210acbb56bd1a1bc7edaf3a1b844ce9eba81b19dfb25f737c84bffb7b3f2a4ac018d45eb8add9c6c3e55379d440527d82dbd5fb2928399a9237b9bdf29649ce SHA512 85b82f7e77261559c40550d0fd5353098145e6429654c2e23622bffee0d144c096ff9b8932b224c16f391bbf140990c11e9163b8070b5bb719ab94ed6a5ad2b2
-EBUILD gcc-9.1.0.ebuild 569 BLAKE2B 37c81c52350c6d4ef28242aec8f0d35a71b69fa71cb0971e2ca8f9e6de61f4db2a56298fb26c21e7e3cfd7ab02aa37b05003a18e6f1362596fd7605e4d22dceb SHA512 5b4102d53b6dcf0c526686bc399bd345f6eb465e3bfc5e7e373fe91bc74739d71a71ac564a8077e2b3f266cb43663a5c39135c9b4174706b14be3f05d8ea953f
-EBUILD gcc-9.2.0-r1.ebuild 478 BLAKE2B a311a58900303f87c06bcae9e47bc3b72b8765a0ea5b81989c927d16a7a0ac6473c58484e360cfb697198351719d2f22d508e74e88ac0392f0e9a1c57dea9782 SHA512 bd193acc9a279a5165483c5e0e9be5b9422881b3d8374f044b2a49deb90adf4257a48a73501fe9cd717f5de4703905e6c1c9b49ef6fce271639c8c79448df8f3
-EBUILD gcc-9.2.0.ebuild 478 BLAKE2B c995e60e6445a2f6f7e3adaafa0c3606b3397f5e7dfe993a1d90e9e1fc9ec51c1c8818cf4a7477b50a4679d157b6a68d2f4b47e7c267ee887761a767cb91439f SHA512 4db08af75e195ec16264fd7f203679b2a8aa6b27e9dcaa6aacf0b3ae319f501d8eda7ddb2baf47ac806c55d115ddb398a284107b0ed5a9d5fbd020770dcb59d2
+EBUILD gcc-4.1.2-r2.ebuild 645 BLAKE2B 4e6bb17f0257f81df638f5a0fe5d21f267bcae2b1e103c35c2a1c24ec5a667895293eb43767399bc216734fd8c1505a657a07ded860c559e7474507b5efaf0c6 SHA512 9e7b1dc667d7c9713cb57dc9de6201ae5953b8c7abdcde7eb517bc5469ba9017914391190864ee8da47717712bda6474c437d445508d9ed3811e509ba29907a3
+EBUILD gcc-4.1.2.ebuild 639 BLAKE2B e05e77b33a082e8da1f2f3e4e6940b49a7380e74732ed59c0e21cd4ba64ad5ae14067a1bbfa799df8e9de9d422a570e203b0395ffc5adb0c99311f9c017dffb8 SHA512 84226545fe5f56e6cc27f56a53a2ec5259a5844ea9de13f2a5ec136597034c6c362bd90543bf4fd857244f5126576dd37729fcf4869f1c9ebb755641513328cc
+EBUILD gcc-4.2.4-r1.ebuild 384 BLAKE2B 0c2e15f263640875c8eaffb8ef818a870d8393d34864b606cc6a376a2424c6850c6584e6a033383fa86bfe7a9a8d55219d843517ac2a9336181270836e1dc26e SHA512 8cac17aa46816b7078ccb5baacf5dab88ecb6e5067fdf5baa0ea40847b2de51241d4f4c2a7df3437f71a617166d1378da679322d10740f8fd5b921f745974cda
+EBUILD gcc-4.2.4-r3.ebuild 382 BLAKE2B 1a4eaa374f6320d9d74d6838adfe15e75df48f772164ed2a29b307a2f5bb47043bf8a6ae615f684da09614be559e7d40182a86b43878867aaa40b8a9edfbc1a4 SHA512 714ce7583805a3ec20427ca3cb8674880ae6a3778eef072fa70195691e7559bfff4e5b58d670bff6ea54a0c9e0e59465c20d9a5c7e6f77894de2c8abb5bff954
+EBUILD gcc-4.3.6-r1.ebuild 620 BLAKE2B 0005548b6c588cc49c64c68357edd47b5f484b7d98bdb66e6c0a8f4e6d4393e37c43a35bb23276ffbea5f660ea0dfe726e0ec31340100681bc66366ac081f5df SHA512 6548f867b27b8cde18d2e22334c4a7cb52587491cc20553dfd31faf09633784cb9332335b45923f349c6f6769e1a8aaa43fae476a8d2db6979404b553054684c
+EBUILD gcc-4.3.6-r3.ebuild 625 BLAKE2B 05d5d5a9479619e2557469b8916bf4d97174d8a422b047b75450bae59a674540329dfc50064c9ec110a181e8dec0c37c4bdb1d7fb99fcf199fcaebcfa861a9d2 SHA512 d9b7b05da1b35aa0b32fb1cf018b5fa5e7b8cabe0227d17fd5c7d300b13e48e06bc6849de48ea79f911e8c61f8dcc474d93df2cbdce2b5ddf4cca0e7888e1248
+EBUILD gcc-4.4.7-r2.ebuild 670 BLAKE2B 26855169a9b2c3e030ab7d7726cfd49c868ddb9fa3a29b010901ad78a212a98da2d4fb6b5975dd8440670c6b8075df7898915eb07053febd8309fc307d75a495 SHA512 924332c285c4711d892ddf5cfb207768d338f49e15c98d82069f21e1359793b273fad658a660f98b06c65413ffd5fa823d42694443f2d507296289ffc964bab5
+EBUILD gcc-4.4.7.ebuild 664 BLAKE2B 9e73a4d9a1d6ee39c7c99b2ee3715271507f8dc7b9a19ef67e69608b685aedd35f8e3b8b058b9975905476ac6cf332f7896bc20dd6208d0782f2a63d83ce1c97 SHA512 59f87d093a20896ca84acf1819e3e01118ab7a87ee8206608750aac19f24d196aea9ea05d6048a64049fae45409b5b48559ea8fad53979758a59d93093b092e0
+EBUILD gcc-4.5.4-r2.ebuild 671 BLAKE2B d4c7b126e8425ea7243e7a0455a9d292d71e4400c5a1c2038924b3a82e6671a7aaae23ce25d278aeec1fc630f061cb33322a7a8252f1cc9a488594480e76b409 SHA512 9255d4766a9a7fdbcf461fd5858ce81815eee4e3360453aeefbb88d5edf1d25bf503719b4535f5dfed5c39d99eea02cd6a22f10f57ddfe05c9b4ea31b27f485e
+EBUILD gcc-4.5.4.ebuild 665 BLAKE2B 5b83269a6883147bc328c2cb773fa873ca866503555af6445549477df6f4c79bdeff45d1a6224970da5e6cb820da2fca375541f9cc75757c18e41de378b4a7f7 SHA512 b80d984dd1569a34f485d5c3cee2fb7da955849c34e6549f706e3594ca84e36d32dd0322d1264f12c7f3f1aeb6d56a21a7184311ed6b247814b6aecbc429854d
+EBUILD gcc-4.6.4-r2.ebuild 752 BLAKE2B 2ad17521fda216cebbd81f09fac5a45ea923099caa5ec565aca8d735045a44ddc11c815a41a002e695425fecc15c7cfc17bbfb5b8bfd6a940f89e5a154fbf08a SHA512 783c5306f1272268f85a259ecda8d4c6f681e5b0e4a1d44b6bc2e928191f69225083236f31ce7fd421a4c8bb68fcd1bfa2c43785f70a71b24e6a974ce6991b8a
+EBUILD gcc-4.6.4.ebuild 746 BLAKE2B cff0a4ba88b67c30dace6567e58729246c767b9e5ae38d0ab71071bdb40a1767e81fb88e95854ba8e9afdc433e6a7a9bcd4d63c0cc5cf41da396f6802a51ebe6 SHA512 1b2f1618e4ebe63cf6304e56008618611fc862b2e96279f3a09f4baecc0e624adbe7c41b9d3467a2d54c5c2a0f8fa1c26ce49e5383f799ad23b32c7484bb5c21
+EBUILD gcc-4.7.4-r1.ebuild 1266 BLAKE2B aba6e2589b35bd8e6d172941dad424aa7763d65c7ead0af50dbff1260a928a8c8fd88e6e80fb9ed946883ce66ae31ff19198532045c096471925450ac3a30266 SHA512 38d149c4a916ac0a4cf032000550285c8af692b2681058ab3af07eca5745bc3290a37b09a6fe1be1ef422dd9f2bf1531f9d32341fae4d534bea37458bced82e5
+EBUILD gcc-4.7.4-r3.ebuild 1278 BLAKE2B 7bebadeeece4abbac0aadc45a86e3cd85ee2f3acbfaa943835dd051ee4d157356a9434800371936a78f33bf7082ba216b7e205737cf9110488c60683b02df690 SHA512 fcacc27b7406fa747e7be7bab432ab9aca59d51fd0ab23a1f922ff074f6c77293791473a5630731332e4bb225d3aab9ac12b860b538e56bc3eb4a7e9567ef61b
+EBUILD gcc-4.8.5-r1.ebuild 1379 BLAKE2B 7e5b9f6c0eefbb8245ae85555db1367636a23659b44389548312eff6e1577672b12731a6ef53b514b605dfbbf056baa9ad55037828d00e7587c60eb4e22fbd55 SHA512 9e8025d98ed2503ecbc7d9eab87a9fa6f1a5f538e82a565c967f9da0cfd9ff5c2fca6fba9de6d7ab0ced4c4e8040ed21b4e2b453461a27f5133b38de575a94ac
+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-4.9.4.ebuild 1438 BLAKE2B 9c679ca2f020d789b6ff202c6e6ce4490f71a561ce39c10194f894acfb3b4c8c698e7829f412a0ab8c5261b1127256c9287a446b9f7e6c91fc59c2c5a3a084eb SHA512 8548710087c4f26a956204ea685012fd50c64ca331ddecfacca5dfc21299150d2b96dc75be2de44d13aeb315fb794396d2db57a41b6d6584835ee9f65b0a5bcb
+EBUILD gcc-5.4.0-r4.ebuild 1253 BLAKE2B cf875a9c59182778fcceae3cdcaf1328ad1b5862749357d2547d59ef0b148035437f9316fe9670af6ca1453f9c547f5f16a32e2ef6257dd07ffb3a7a3c1bb20d SHA512 57ed71a09f0450566eac1d4184336f4e1b139eb564aa5cb5252e405ca79140f40a98f0f78502db7e7ebe05873b0ddb9df97f56326b19262acafb9f7d4e1c6482
+EBUILD gcc-5.4.0-r6.ebuild 1264 BLAKE2B e8cb5d56de1caa4bce8ee9abd13b8162dcd07fd59e572d5c9612468c2826316f34e0c4691f5b9083fe56be1ee26814ff4c6c3a3d5e70d33fe6414d16496e31b5 SHA512 ee312bf2ab36a547b7b50f34362350e6da4a31c747974a5f323808fa9aa336c135a449fce0ddd3882771fc3eaf0e6f8a451b46745d35fa5ede810cc939df36c1
+EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
+EBUILD gcc-6.4.0-r1.ebuild 503 BLAKE2B 4e975145f5178501ab1395ff7b006c1801540658b4f22ffaa9d868a7317f9ec14a75ffb6f67152bc2f1bfa03cc18c660ae658598e93b6af7b4d6b24bbd3147a2 SHA512 7c78d60d0890b13035046021b9bf8e98429128841b3b9f8395a93c749fda540eaf74fcf2fb6eae0015bd201d19807d3c9ff868542359d85cad342eacfac8f93c
+EBUILD gcc-6.4.0-r5.ebuild 510 BLAKE2B 038be8e0a938d097fb227ff0d37f109ed8e5d4b6c27a22b0dabe1d63921e55678225e313a7eab1bcc59bbbc21d51f801a879e299982f238720ef012e16a3459c SHA512 f38908994a93fe52659c6e368ef205617c57d6aa039ab92773682b9fd5bcff3d29215114f79b52f32acb0b53064942316d1ca331a5c0257beb381dcc55717d8b
+EBUILD gcc-6.5.0-r1.ebuild 441 BLAKE2B e0c319a5db64d1c431415b6c3e855898b349f351e6bb069307d81a03d14bed0315371351cdc609409cdf17a36617404ba336dd5ed18531d17678178c474fbcd8 SHA512 b02f43a6d8b557ce5f30fa497d3264361de88ca38fc37fc7326ca295c75be6690f023f28ae1a2a7984f49ba6a55eaaad6e12dd51cdf76e4c64688d956afb3a71
+EBUILD gcc-7.3.0-r3.ebuild 512 BLAKE2B 5dcfac456882dc9fd89dc8f24b12971fc1f2b127923df8ff79a395d387cbb1394ae50b59268d0c850ee80d4867f8b2fd84b1ec8a42bbd647b8d5834150ba93ae SHA512 392d93ff982cf0d3d76b377e39120ec55e6a902b76d2de7e3c33893577040a49c93c1d82f03f058939fe5a757441becc6e1b7e941b81d97f05274f0583c5554e
+EBUILD gcc-7.3.0-r6.ebuild 522 BLAKE2B 755ad4c05d992ac021ee698b06a19d56c582ab920b609a97e97bedb3b7f89a920e579b00ab54cf8eb8cbe45c5a327389c3e069b647237b36e646bcf23e0ab159 SHA512 57d1e0ac05d6567e1676814d3e3a5e9880d74d9f468df2b015d28b296ccfa7740a8062ae152d6d398309f2ceb167f09db7da920c551b1d1a34228a016e1ef33a
+EBUILD gcc-7.4.0-r1.ebuild 462 BLAKE2B 4f6d76f13eb65955a6637a32fab88765c539766a6aa35f128520fb23f7277cf3ced0a5f7fb603ba68fa9a51926f1253f9a6006a136c5142feee110abd2fd3609 SHA512 3c2f61f81b47bfeb638549a86131c537a0085a72d33c1fd7609b7fd7549e9ee0f412493fa7da3a24ef202edd4e4ce7b37856307a70b07976c95e552b1656f8b8
+EBUILD gcc-7.4.0-r2.ebuild 454 BLAKE2B 001819ad19ea25d1d13ef1a5c882f255cfba78bbf33b88e18d99f2d7613b83ae13c6a6aa130f3e4aa3a187c99ea4361085386e5643bc060b6efcd4609f8032e5 SHA512 5eeaac1365df066b9cc664abb95f44f34d4c482607f4adc8a9cf7c52818c8179de548b1ef1d850931998add067b516d0e6da81e55a6ad0957317dc378d6b50ff
+EBUILD gcc-8.2.0-r5.ebuild 469 BLAKE2B b3692d021177644a95419aca62e9f7f11d0675cc0e5b73fee6232a2f4a8437d2735f74765420b8a4408be4c935217e915aa44a2feb174f86ab741d7d301c81ac SHA512 a91d521c557bfa79f1737d5023c3e271cce2bd88b8b9dcdd00d07e7944ff8d9a4da8175bd445fe813add966517c10398dc21fbbffdbbca906a5a938ad319e317
+EBUILD gcc-8.2.0-r6.ebuild 551 BLAKE2B ce07e5a5450b5c503b96e6000cf11cc8be10c80a7fdfb7928430cb9326470fc3ce6f86e85fe65931af282159c1d7eb075553e87d7d356c332bfcec0f6d154334 SHA512 8a773b462295156e8eda8eec0e173f667ca0bc528ed143f6da87c16628fcde56e96858cc8abe6cf72fb7226c088b95f998c8777d25f8a2f517240a3fed4a97f3
+EBUILD gcc-8.3.0-r1.ebuild 589 BLAKE2B edf51a3803f74dc734274c1598996a783c68e116cdddc7ce3ca596b87a9c6fb587c600ea0485a0a82afed3289a86f3d63d706ce3d706ccfd451bb96657ead637 SHA512 0e89f09a97f24420f100f992c6e066cc35c15ca62d9bb477088625e029e1da18a36b036a0b26954848487c5a8739dc7d6706d58d825898345c53c19c55083604
+EBUILD gcc-8.3.0-r2.ebuild 545 BLAKE2B 714a2df9755a80b710f86dbac1a4952a4c9d5cc8f4f02f8a72bbd51075f7ea4a3fc86f319a870262aabc968c4c8942f7f6ac1a3a42327c25e1fc8fae60839d97 SHA512 691189b20477748877e73e6e7084156fc64baa41057325cc1b2556745bf6509bda065e0867416b60e224e74be838615d1adea40fd0fd3ca067aa2d570eef92cf
+EBUILD gcc-8.3.0.ebuild 451 BLAKE2B 2fcdd71b1cfcf9b81cf2c2a26e859dec96abb6d749ec18bcd9926105db0dcfaca78aa3afe8ee59a52462d2a16f174c90ea33ea5fd9d59f6d88bbd2c60bec6afe SHA512 02704672e19662e9667ede97a5e85a21fbe760be3f48172bd17393701cab801e126bf585dd726fcd614002eda209bec06b60ca47f8e6139243f9c262bec3421e
+EBUILD gcc-9.1.0-r1.ebuild 458 BLAKE2B 0e85fb6cd36c50c7158df2c1116f2a022dea82b6a03a0f8680de6fc6b9350e3b1dbdcc81dd001b1a9d2897cd474d7b81234c8397a4a77f8a04dc335ed4ad94de SHA512 1aba6bc02aacd1eea97515269fac9ead83631882a69a4c01026d111a7c87860292929d914cdfd5e5749319a0be775fea852e6631f320744e0c169a21e74a4495
+EBUILD gcc-9.1.0.ebuild 547 BLAKE2B c4781dea03f7a58b88c3e860028801faf92638e50db24f2b2033a360d8de8e5519c8e3594bf59271cee087f36ab39bc8d84f8a5d42a67d76468f78bd27ba839c SHA512 d5287c6f8b1d406ba5eeec1daf7362651bef74a966241db28790d93388d46c0a807e87e880fbefdc1be76c38463591707733c8512daf35485e95dd2c824b830a
+EBUILD gcc-9.2.0-r1.ebuild 456 BLAKE2B 1168d4b532a519290ef57b889bf26ed1ddb68f2c866a0255054fefb6032f033dbbc367169e5c1930901e6e340289428a8ae275db5aad05ee30c23e54f73189a3 SHA512 1855114a1e1a815d3e4ef2316d4ae00d60900b08d160a74fce7d375371e613e07e80ed644bd8aef2376472b62634b05ba8f3233b5b055b02fbc3ca52026d3f54
+EBUILD gcc-9.2.0.ebuild 456 BLAKE2B e3274020a269fe99d86ec5f3011e76a29aeb04cf6337399b1bb282b2e057c7b2a9621d57548482c8428bd2e88477dd4c6fa8af40a8bb035874b4741867721315 SHA512 2d15d635ad6b6cae0382e2a771a184f73a1c51b472847fbd4ac12c1b019d49c7cce6ce71ff1904252d0c7ddde755f90472f334793e6707eb1b7303faf709d159
 MISC metadata.xml 3010 BLAKE2B 1a52f8672191d79b8797e777952e32728c88f7a54e05ff058129ac4281f46753beba81726e11991d3d06b3ff8f5d1613718b8e26c8897955d8438bca19a3fa60 SHA512 d6feda30c1d16d470fe5598ec28d2025f7b074899bb0a451e0b7e6dffdab2bc9c106b0cecd649e35d86b331fc220e8c4a9178acea510ebd23b08547c66089751
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index ef118a8b013c..0389c0bc4377 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh 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-3.4.6-r3.ebuild b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
index abb03a923180..3a6d9f58e5d9 100644
--- a/sys-devel/gcc/gcc-3.4.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-3.4.6-r4.ebuild b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
index 97c3f7c26634..691eeea7f8e7 100644
--- a/sys-devel/gcc/gcc-3.4.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 d85b6868f570..574788a3f09e 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 1bd5531ab99a..fb958bc86e3e 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 10a790a9fa05..ccad607df6a5 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.2.4-r3.ebuild b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
index 15529ecc8370..03b5c5788ee6 100644
--- a/sys-devel/gcc/gcc-4.2.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index d483c32ec950..13c159fc06a6 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r3.ebuild b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
index 637aa208400d..f160e48e5044 100644
--- a/sys-devel/gcc/gcc-4.3.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7-r2.ebuild b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
index 7fde120f47b9..5f7a73a76bee 100644
--- a/sys-devel/gcc/gcc-4.4.7-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 694e5426d2cc..34640172a986 100644
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4-r2.ebuild b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
index 1102974a8408..3eda7487fbf8 100644
--- a/sys-devel/gcc/gcc-4.5.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index f013c619a99d..0735102e9246 100644
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4-r2.ebuild b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
index 99f7924a0ced..ade4c68df1fc 100644
--- a/sys-devel/gcc/gcc-4.6.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index a3b35cd898a4..47155da62601 100644
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.4-r1.ebuild b/sys-devel/gcc/gcc-4.7.4-r1.ebuild
index 64bbec9fd4d8..e3d14526e937 100644
--- a/sys-devel/gcc/gcc-4.7.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 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 -amd64-fbsd -x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 8aad0d383265..06c6d69ad260 100644
--- a/sys-devel/gcc/gcc-4.7.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
@@ -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 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
index 547dea86f3a1..bd652d8ed76e 100644
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 006faad08faf..4c11d5d39188 100644
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 b935459e81c2..a1f1723df03a 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index b5030ce317fb..5edaa285cb58 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index 181c11eabbbd..cd5748b36ff5 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.4.0-r6.ebuild b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
index 1c5a20716c10..e95e159b4429 100644
--- a/sys-devel/gcc/gcc-5.4.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ac8d9c9e40be..629e831d74a6 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index 927fe13ced5a..a662ae793542 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0-r5.ebuild b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
index 8f8f11741c12..138098ca5674 100644
--- a/sys-devel/gcc/gcc-6.4.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 32e8d79202ce..0a8f58febc87 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,11 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-=======
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 0cb2bde8a3c5..24887e44d2b8 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.3.0-r6.ebuild b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
index 9a748f4aa6b2..b1d74320f938 100644
--- a/sys-devel/gcc/gcc-7.3.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.8"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r1.ebuild b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
index 76bd028c8fec..bd17a751b0d3 100644
--- a/sys-devel/gcc/gcc-7.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r1.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 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
 
 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 95b9174eef81..62cdb74d516d 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,11 +7,7 @@ PATCH_VER="1.3"
 
 inherit toolchain
 
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-=======
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.2.0-r5.ebuild b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
index 602acddf5607..73a14f4d9f67 100644
--- a/sys-devel/gcc/gcc-8.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.6"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.2.0-r6.ebuild b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
index 08707ae05afe..0fdec953b413 100644
--- a/sys-devel/gcc/gcc-8.2.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.7"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 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 eb795f49ca9d..bd9df9561f86 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r2.ebuild b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
index 987d7f128651..c30baaab62aa 100644
--- a/sys-devel/gcc/gcc-8.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
index e7fa7284e87f..15779b5b4bc5 100644
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.1.0-r1.ebuild b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
index 73c93d32ff1b..ac9e761fd5a8 100644
--- a/sys-devel/gcc/gcc-9.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.1.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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild
index 16bdf7beda9d..3aeba122c2ae 100644
--- a/sys-devel/gcc/gcc-9.1.0.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0-r1.ebuild b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
index 29311a0ae4c0..112f62afbb3d 100644
--- a/sys-devel/gcc/gcc-9.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0.ebuild b/sys-devel/gcc/gcc-9.2.0.ebuild
index 585bf05e13a0..6e7404c49e5d 100644
--- a/sys-devel/gcc/gcc-9.2.0.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index e5bb47dcf40c..c2e0aede6cfb 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,6 +1,7 @@
+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
-EBUILD gdb-8.3.1.ebuild 7207 BLAKE2B abb0fa5f13c95a6dd64e9672e7149b871eaf6fcfad0d74ef69addb10779d0cbf299dfa730f117748ad5debf56fafd56807a7853c976eee1017240b5a3a442ecf SHA512 db11a68493bbddebc1a703dddc3455afd7417d7e2c57fd9aab57c18e3372c35a52aef4d37bfe7ec0e861e7dd324e904d55f92d9098bad35bdbf8febc54dde8b0
-EBUILD gdb-8.3.ebuild 7194 BLAKE2B b99060f1a38cb582e5455ddd334c49c1a4dbcbd7a97fdd5983c19d60a503bdb3bf90957e835070b823d5a43eda584b625081e484a772f6be0dc7cebb46711aa1 SHA512 18476bc11a487720655b30128da1aa4a1d929ef14393a4da0cfce65522f1c801ccbb6b20a53bca7fb66298ce02753dae4a77e1fb22cfb67f075e55e21a44c166
-EBUILD gdb-9999.ebuild 7207 BLAKE2B abb0fa5f13c95a6dd64e9672e7149b871eaf6fcfad0d74ef69addb10779d0cbf299dfa730f117748ad5debf56fafd56807a7853c976eee1017240b5a3a442ecf SHA512 db11a68493bbddebc1a703dddc3455afd7417d7e2c57fd9aab57c18e3372c35a52aef4d37bfe7ec0e861e7dd324e904d55f92d9098bad35bdbf8febc54dde8b0
+EBUILD gdb-8.3.1.ebuild 6900 BLAKE2B 7c3b0c0eea4502aa0ff524ffb0eeafdc3b3d5adc2e9b391ecc0f829352e7cf19a3223fafd5236ecfd23d418d90063696d4dde556d7e4a79747b6572f1711935e SHA512 8518fa8680277c7b7afd0d07b9eb1d0917a4ea85ede1d9db0118bb98db0c723701a52aedc2a2b09f88a31a697e5eabcfaa07164d7131468a602e6f0c5b7e9045
+EBUILD gdb-8.3.ebuild 6646 BLAKE2B addead64692b11e0f5d183559bee6eb16b90f365ddad09d43b83eebfa2a752ae9979ffb2252ec452942925aa2686d74e2f62a90762693cc4b3cc19e8ad7e768d SHA512 31ffba3a8c285a940a4a0ec60eb7ad10f0ef3a3efbf720fff4199d660f93a834b8b4dc3123eeffb511dbc8b4eeb84a2c6feb8582b6dd883c2a8caca2b301832d
+EBUILD gdb-9999.ebuild 6900 BLAKE2B 7c3b0c0eea4502aa0ff524ffb0eeafdc3b3d5adc2e9b391ecc0f829352e7cf19a3223fafd5236ecfd23d418d90063696d4dde556d7e4a79747b6572f1711935e SHA512 8518fa8680277c7b7afd0d07b9eb1d0917a4ea85ede1d9db0118bb98db0c723701a52aedc2a2b09f88a31a697e5eabcfaa07164d7131468a602e6f0c5b7e9045
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch b/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch
new file mode 100644
index 000000000000..06aa6084d2d2
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch
@@ -0,0 +1,13 @@
+Enable verbose build. By default gdb ignores even --disable-silent-rules.
+Override verbosity back to non-silent.
+
+https://bugs.gentoo.org/695936
+--- a/gdb/silent-rules.mk
++++ b/gdb/silent-rules.mk
+@@ -1,5 +1,4 @@
+-# If V is undefined or V=0 is specified, use the silent/verbose/compact mode.
+-V ?= 0
++V ?= 1
+ ifeq ($(V),0)
+ ECHO_CXX =    @echo "  CXX    $@";
+ ECHO_CXXLD =  @echo "  CXXLD  $@";
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index 71cf42ab54ca..feca5f541915 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -27,20 +27,6 @@ case ${PV} in
 	# weekly snapshots
 	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
 	;;
-*.*.*.*.*.*)
-	# fedora versions; note we swap the rpm & fedora core versions.
-	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
-	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
-	inherit versionator rpm
-	gvcr() { get_version_component_range "$@"; }
-	parse_fedora_ver() {
-		set -- $(get_version_components)
-		MY_PV=$(gvcr 1-$(( $# - 2 )))
-		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
-	}
-	parse_fedora_ver
-	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
-	;;
 *)
 	# Normal upstream release
 	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
@@ -60,7 +46,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-fbsd ~x86-fbsd ~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 ~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="
@@ -102,6 +88,10 @@ BDEPEND="
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -128,6 +118,11 @@ 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
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index 7a92d8c02987..f0c620ed6cb9 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -27,20 +27,6 @@ case ${PV} in
 	# weekly snapshots
 	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
 	;;
-*.*.*.*.*.*)
-	# fedora versions; note we swap the rpm & fedora core versions.
-	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
-	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
-	inherit versionator rpm
-	gvcr() { get_version_component_range "$@"; }
-	parse_fedora_ver() {
-		set -- $(get_version_components)
-		MY_PV=$(gvcr 1-$(( $# - 2 )))
-		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
-	}
-	parse_fedora_ver
-	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
-	;;
 *)
 	# Normal upstream release
 	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
@@ -60,7 +46,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-fbsd ~x86-fbsd ~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 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="
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 71cf42ab54ca..feca5f541915 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -27,20 +27,6 @@ case ${PV} in
 	# weekly snapshots
 	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
 	;;
-*.*.*.*.*.*)
-	# fedora versions; note we swap the rpm & fedora core versions.
-	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
-	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
-	inherit versionator rpm
-	gvcr() { get_version_component_range "$@"; }
-	parse_fedora_ver() {
-		set -- $(get_version_components)
-		MY_PV=$(gvcr 1-$(( $# - 2 )))
-		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
-	}
-	parse_fedora_ver
-	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
-	;;
 *)
 	# Normal upstream release
 	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
@@ -60,7 +46,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-fbsd ~x86-fbsd ~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 ~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="
@@ -102,6 +88,10 @@ BDEPEND="
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -128,6 +118,11 @@ 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
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 09291e1abc76..deeeef021db6 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -4,6 +4,6 @@ AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD gettext-0.19.8.1.ebuild 3965 BLAKE2B 02567baa2f33426b8fbd53418bde02e94203f23a7a8a21097f830cd4d52912408f510231443485501907298c07baa8f1d7a589a0e853e0c3497ad18a38fcd599 SHA512 d378410f09373fbc0ba85d521b1c842fa32bbefe8a518a90cf7d5a9f400bb7ce2eb593f9061313837ccea4405b1cd8719f0aa073d6f1584597670c8c666d61cc
-EBUILD gettext-0.20.1.ebuild 4072 BLAKE2B a58a7e1acd28791f41805e0e75dd8aceabf7b7dbd2e350f474f1fe0fc1a27b9015ad882df5551b26e4826c2b0d6ed8ccd625aa198e309d457f708f92b24e931a SHA512 938ddc48763acfd3b90501bda57c9c205586ed90faf474c86c1aa9f7c720a6d82e3ad426f68fb4dbd896f8b68daa997b8396afb83f6d21ba423437012a1ada1e
+EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79
+EBUILD gettext-0.20.1.ebuild 4050 BLAKE2B 6dd494aab1281bfd62ea894971a6bd27d4a1e050cf859f11111d163978cc908f8071fa385f55def5dfc24491cf7765999b09a94e44ee62e90fff0801a5153aa6 SHA512 e5f60809aa5477fad33e9d73fcc7a86887ead1d8122386ea928f95d560c3d65ff5a2b0351706bb167083f774af12aa32b7d17b08463b04e17a7dbc99ef9800a5
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index 11311e92bc80..ca4ca35f618b 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 8cf0b2e8bd23..0bcc71805343 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 0840103bee14..f596174779d6 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -3,8 +3,8 @@ AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1318 BLAKE2B 1844a1c5240
 DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440
 DIST gnuconfig-20180101.tar.bz2 51438 BLAKE2B c09ceb107bc446b04feb6fda500a1d869c8e0841bb72b7116c7bdadaa737cc25db2715ab3ce20429a9a7d4e0a5c0b054b63b21fc49da2f65e277169c34b5e2ed SHA512 3af359088e8e93c81ec49bfae90839266596c2566a663839b0e91c4d4319d2bfb91738af9d5fa19b9d53703979fbddd81294bcc032b46c33b94f1961ff9f2178
 DIST gnuconfig-20190804.tar.bz2 58538 BLAKE2B ec2ef7990e94eebca655db3f7e84a0294ca59f4753e33f69bdbd4d214240e33472abbfdd99735ec71d38a3d542501603a54e979e2aad4776c5faf6646d016956 SHA512 c24e0a49046d2a7fa3a77a22f06be8b97adb05541a95225c65c1cea47f7977230db1954666795019d28c02a4676acb93cc8b5c53f1b838e28fb50746630af82f
-EBUILD gnuconfig-20170101.ebuild 1552 BLAKE2B af79dc52309ea125f1e424d60ed04141fd94e36da24a9cd8f7d99582f67a588ed12b9c8f80f116c6b225af86fd0f39b41bec75802c144f72c26c1ba5115c63f8 SHA512 59d0cc38277e881eeb75dca77fa497a247edafee7488dd6cf08aec0e1839fbe3d651f38e79a905e59ab37e1a3650fb360f58d23fa01b6765a46265cd4015eedb
-EBUILD gnuconfig-20180101.ebuild 1567 BLAKE2B c085296eb227b05e021048e2f3a5ce1b36cbeb783e5ac829d90a18acf71f74f60e7c1dd8a4ccdf5cf7a823e6ff43707555ae19d7a67057e1d13723da12bd94c3 SHA512 e3d10d89dfdfd42554197057cda6724a8725c93cb235812d578281c2af16f8ee30826db9c30380b4d40eea65a05ad88fb0df7e66ba8749b068829c22792699b8
-EBUILD gnuconfig-20190804.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
-EBUILD gnuconfig-99999999.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
+EBUILD gnuconfig-20170101.ebuild 1530 BLAKE2B 05981235db138b6b8f87114bbe36ef300eee9818eead70a7d036d799e7b05079701dd56d1b782f7e8022af5ba86ebb5ba740cc5a57cafc0e7367c399826884ae SHA512 c3c31d225ce0711f01b9a321a815f3898190d85f242d90248af6d227bff3e8f1748bbd72f90eef68d20bb0301556a6a1369654cc632af1f2be9f70e7b0a799dc
+EBUILD gnuconfig-20180101.ebuild 1545 BLAKE2B 8dd458bf69af25e4818c8ee9b34e03af96dfd697c7b0aa1813396b8af52aecfc0525ae53a69a55e90e036c273901dcb29170a374821de1fd891c6d0eaa5fca59 SHA512 4e61eaaf674ab08d28567c4d17cfa98606cb740ae56e529b064d2c1542098c1d24d538bc5ed2bb7e41bf563376d0801a684180a4af6d76f5234c9d1fd1586bf4
+EBUILD gnuconfig-20190804.ebuild 1571 BLAKE2B e113178cbdf1d1951ff7faf044b1798be6e101017b4f68788d9834033afbc0d45460c2317d34a4435a05059101b84d3e1c21962f64da500bc08d04b9d42a8933 SHA512 3c0fa6f1a3efb7a92fef78ad6e9422b9942ca3d581f1086e2d2d670e911b35f94acc7a2cd6228d54d1ac05b2ac4d489a0070a03abe77745b44b66519dbef5744
+EBUILD gnuconfig-99999999.ebuild 1571 BLAKE2B e113178cbdf1d1951ff7faf044b1798be6e101017b4f68788d9834033afbc0d45460c2317d34a4435a05059101b84d3e1c21962f64da500bc08d04b9d42a8933 SHA512 3c0fa6f1a3efb7a92fef78ad6e9422b9942ca3d581f1086e2d2d670e911b35f94acc7a2cd6228d54d1ac05b2ac4d489a0070a03abe77745b44b66519dbef5744
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
index 0b3c4010d8f4..f132f3374af3 100644
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 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"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 97da37cf54f6..2a59bb6ec8f4 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 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"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
index c7e0faa0146d..0ba18b2c2bdc 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index c7e0faa0146d..0ba18b2c2bdc 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index bf295bd9df21..3250878e4e55 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,8 +13,8 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 556 BLAKE2B a381e0a8d8c585f6f79cd2f15d473f4cd46dec0cf28657a4fa695efaad4bbfc963cc71fc5d8a4681a7a9f3e789b41c6e281329dae3117df2ec4c14a2cf5ca051 SHA512 22d7ba329f7e4c6a9b157f460e2076f1a08cd8f16fc68572c3f07b9ee10f8249855b2d7044be33710ce5ef1fecca3db351dd587001940cb834f9351f901df7fb
 AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r3.ebuild 2586 BLAKE2B e9eafe307085043c84eced99cf201f3fbd9f5160d30ad570e600f28492058350a196537e795f779747fa2e34cec194667949ffd5c215d43d53ef4f5eb2251a28 SHA512 7b1282e9a158ba7ebebc332fcd22335863a32dad1af4721a68d6d3b01712821250ff4f19be9b246d2d04915605915c82b464e5e6f06da3445c6d592e23993fcc
-EBUILD libtool-2.4.6-r4.ebuild 3546 BLAKE2B e23322cae3db6ae0e6f6a5536926659a2ea5a2bcdd6225b3011adae43f681b8a2fe29d26aa89b53a0652d376a938ebde50c16ba1346075e96d283bc1241a02bc SHA512 70d086fca9e9f5b26e6c170659d1f5710dda488330851050cbcd00dec2b2bcbe3f0f5713bfa1c64712e84d765381719a27757d46c2b9a58e9f6a1a2cd4f13522
-EBUILD libtool-2.4.6-r5.ebuild 3686 BLAKE2B 1beefe475a725d684e6b9aa6bccb98d4497a8447fbda67839b977a243b7a595681ec1b167488797e1806aed973c485486a477f33f73c5b4310b8d2e7a855ab18 SHA512 f53280c523e6f21fa7930edf44e8c91f98f578fa9418f909dec4ca414505c268f0018e9cace75d7f3c1b8a1d48f7ff49638451f8f67a0c4b12fb728f8bb86de5
-EBUILD libtool-9999.ebuild 3338 BLAKE2B e5122e24f3a92bcad40e1007a39656aaad5b7ca9ae15c171a4e00953771f91d98063fd05ca33115a25352e8d1e9073218efe74861fd9d48a285f94e2883e042e SHA512 7308be87b811707bdbce23ead476a7bf23857a836d79293b9b036e52d78bf8647f2acc41683658f2215d85a437ba7a0bafc79a3c043d40b0f151357502819c6a
+EBUILD libtool-2.4.6-r3.ebuild 2564 BLAKE2B 3eaae24785c03a7ad35a5e6ab7d06b5ab553b9fa1e3065aa8b4b8f75b98f76e0449d55f778e9b56a73e988014af2c0c0e9af9dbe7a47efc54ef4cd5d7181858a SHA512 eeba50e6d2bfdf056ba88fda462e8658acd7373d4cb2902470aa57356aad91294ab60b70db4a834de51b6b4346cf7929a3246939af7ce9e4efcbe6324ba87caa
+EBUILD libtool-2.4.6-r4.ebuild 3524 BLAKE2B 9d29818985a5bf3bf92af0ed0503640ad6d365bdd112b1fecd789e036f4faf99f1abc9a056070b11638bfddbb0126a10b49c11437ec709e0d174e12f10cd8f5a SHA512 c0637d6ccd622500d9cefcec5410fcfda4d35ed55dc55ea5aeefb7036b8b9dbec20b790ee726c72a2efa3ec246c72f4d64dc43ad69a59efaf0ab22268f5a71c0
+EBUILD libtool-2.4.6-r5.ebuild 3664 BLAKE2B 0d7071dfde38723d1fb76b8b80d742b542ac43abd0326c7a3de348cff3c254ffdb03fc6d1882c6920b2387985eb33652c718cc22e3e8283e715e352483054f48 SHA512 f93d15624ad853809c4c1c8ad4bbd15faf5b33b34ffcb1bf52d745c12286e4430e9bc9aa0a326919971af273f59eb1198b4200afb2ee16efd909247ea97d99b3
+EBUILD libtool-9999.ebuild 3316 BLAKE2B be8a8c44f454a714c8c13d6e7cb5c57ed8cf8306aa5065c8c6afc99b68196bc4242692b342d82695bd23ac817d44825b2e97378b12731334d7b30527988d06b0 SHA512 e5fa949c085dbe2af282e468c58511fc32d5a0f6982002ce2807dd0687a4e5015bf3ec5db199cea84f93c3f8368dfce152d6e036e6f642c701fc0cee63c36fb5
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
index 142f81d011b3..ea32af369d0b 100644
--- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
@@ -13,7 +13,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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
index d571f421d723..a7dc840c4d43 100644
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
@@ -13,7 +13,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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-2.4.6-r5.ebuild b/sys-devel/libtool/libtool-2.4.6-r5.ebuild
index 0831b4f32cf6..9f5c38a68cd5 100644
--- a/sys-devel/libtool/libtool-2.4.6-r5.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r5.ebuild
@@ -13,7 +13,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-fbsd ~x86-fbsd ~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 ~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"
 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 140bf7a5cb41..96ef613cceea 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -13,7 +13,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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7d4da737a51d..549c8474b544 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,18 +1,15 @@
 DIST lld-6.0.1.src.tar.xz 787804 BLAKE2B 6b1d42bf24ca4c4dbfd060f1e40efa106e4adb73ee44a219f1568168b90b2a1430c3bd9c9e7996fda1f90423f8154678d6ee795ba4e179a0a72d86e980cbba52 SHA512 856ccc125255ab6184919f1424372f0f8a5de8477777047e2ab1a131a2ecec0caa9b5163d01409c7c510df9c794f0bc8d65cc904df2baf6462ef53bc163e002a
 DIST lld-7.1.0.src.tar.xz 912604 BLAKE2B f18a96233217a92f4c3033446dbfd03d161c4f9e2b87a3b8383879f21737fb9bc10744e60499245ffda0bc42a0ee78b853284a62283a70a4c583fedf7c6e3660 SHA512 7743bba771f8cd0b8596f65d7daf44d3d7ab9c2683a776bb0030bb510cb03a182f094a9b79f270ed8b223216c6aa3d9789440765c80a8f6a28a7852541973a57
-DIST lld-8.0.0.src.tar.xz 999864 BLAKE2B 31433168de4240cb106b63744c46067c7c71f3b95004e822d2b2c1f14215abc1219e06d99e235714a8931ecba84f5d6867147053343cbee2a668eb1e10b68240 SHA512 43b671546f26a2293c27496584fcae43a99caabfffdbc7f72e06689e489005215b9a8607a4dc66a5469b3139d362486a46d1fbbdc2c657195fd3d3f1a72d2fa0
 DIST lld-8.0.1.src.tar.xz 996440 BLAKE2B 9e205427f5534a69b665620b5ecf6713194421a35e3e815d257545d5a1e8a11d42e32abd685df1d439463b6e9e2dd6134755b458196edcd7c7807b89c779027d SHA512 646418d4a4ce922d1a69e9bf2e472f5d758f25ec21b80a2c66dfe5effc59c9c312fb167cf64ee2d8a2ced986e7474ed3d2996a38be66fbf63c574229d28e0900
 DIST lld-9.0.0.src.tar.xz 1100608 BLAKE2B 3deaa980db62fe8e045cfb6fcc057161c4dd54f7f72e8f447794a563b9ebb6c255e81710d3ce4ffe14ce3a9d3d42be602e88f623c0290e870af18e50e55e884c SHA512 bc4812232840ef5edbd8edf1d1a329e85a4bfd3a7859fe322e11dd053435e722c6f1140a718fd2b3524ee9783a357178d2ba30d12519847bd3acc294698007f3
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD lld-10.0.0.9999.ebuild 1732 BLAKE2B 56f15c9e230ccdd2fb2440d4740cb8243e9e09948f15852718df65bbc628e69ff1a88e43941aa402f37e90041ff56e9ecf76bf397ab19deb7ba825448f99b7a5 SHA512 00f8b6cb9a4daa398e092cfe7a1d1e2871eea36161bf4585cfc9a4b031277cf419079a28c9a1c84c401615b610a4f0412ace53912d969a3cf3b1a59b96e28d81
-EBUILD lld-6.0.1.ebuild 1731 BLAKE2B 94a45353bb5db9ff18974afbbf2f77f00814302af1f146298da97cc53941811b91367aee89c82365e1a712ad7d86b2e8ad0b6b59653e56296c7e45e8ab65a266 SHA512 3985af3b2b300c6ddfade3c848a51f8dd1254f15bc3c51cf4d6a5bf8d655de756c8e5315c5594f65f07530b8d21526367f4397fd9b39f895a5f1e525a3aef409
-EBUILD lld-7.1.0.ebuild 1737 BLAKE2B 85f64c0cef8e74db4caace97d2c49eb78bcca24cf5eae82c9ee7faaa1bfc81b14f02e4be948681ecf23a7a86e1cb080666420e9da9bc3ce0856454b3afe68da8 SHA512 ab6d48d872e1dfa608a2e9ca88a907f6bd5f6951dafe5e938d9448279ee7930bac21f9d9c5a8cd6d6523cb4302b0f6822f27fca153c76ae0ec58520e106c78ad
-EBUILD lld-8.0.0.ebuild 1740 BLAKE2B 4983c4001002413e79947b461edfa0685bd90f2d9f4a597d80e8df2dac45189a0a5989384ab7ef0124a1e86aa1c4af2fce7f3ad77a18be6578b811058a1ed2f5 SHA512 2b79af989f4d73dc7bdd55ede94d28b94fa9e6a206fb5295308d6dd09355c34d71b616d28983e9fb80d46142c00fd8f02b64af4bd22514f5aa22e822037b1457
-EBUILD lld-8.0.1.ebuild 1806 BLAKE2B a2b02211cc4f7b1bfa4e4ee793dbb7e97c955d5826c678d2784bcfb51477f9af4a87352ad281c73c0d7ca3946cab3744f7db1343e5ba2ce93bff6b6a5ee98e74 SHA512 c87793bcab56497639c53799efe9723756d1a13fca8745a8f1474b273b6770982aff953e3095d2a5ce9d445a12f6dc5721055536fb4920b9bd82061063c9afe5
-EBUILD lld-9.0.0.9999.ebuild 1757 BLAKE2B feb199a7eda6c979f17c990998241e61e7b0965b3706fcb5a98ff2ac3422accb17623008b2646fddcf26f28daa513762ffcbad8df469e9cf4ce3e8a78f138140 SHA512 673b939d4b005e652abe3b9e8da40c1c41f0fde09550b4619bd04dde4898baea565da6ce72205b62666da2efeed0f87096279013533d88d9fe42999747745cf4
-EBUILD lld-9.0.0.ebuild 1822 BLAKE2B 5feade600741c8314027b9d2dcde5dbfb22136e508b73af512139abd4bc876187ec85b1ee914b124e4756f0d55f9160218c4ed7b9f4c7530c886a782f40cb375 SHA512 75a4aca6ab747d99b32556e42d5ea33e612ad5867ca747a512b99a0d2972b6f6a5397fb8715c6b54b2309a0babf39c5d6e52d9047e71e463373637d5e1770b18
+EBUILD lld-10.0.0.9999.ebuild 1885 BLAKE2B 708c9d6ed0d818ef10994535c68d2b9d99c44a35aae799ed26375bc8cc3750e1e66856c94e2dda75c825ff752e2721cef9386c98de29ae3795b2b010dd57fa3e SHA512 611358ed36abb80d1f6a52bd54de9b5bd94145c4fa5864a0af504bd260d83ff917607d75d7cb8ea4ebe7b06699ba83fd5dc954fc1c8e59480099695646cc5fd8
+EBUILD lld-6.0.1.ebuild 1719 BLAKE2B cb698926f7f3eb053ab46b549293cd5135afa9fe167e27401f08c42d2ef47f3585a2fb7411711d4393f58b65c21e92bc7da57bec55dde5ceed98eb8e16cc0993 SHA512 069c8b6561ac1e05552f4bf2b7af13255586022f45c7f929a5d4c06560eae3692f74da553274d49390ae8e510d0cc167800d1ca946e3ecd39d2632d3a66a85bc
+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.0.ebuild 1810 BLAKE2B 0c22845cb2b6c1ff1c5e3d355c1eb8151406ea73b68f3eba1c7007407494270a1bc564f4e3ad34d2b167dd1842534b906345d74ea4fb2ef7a149d7e20521026b SHA512 ade9fdea84d8309a5f8b5a0521f06ddd0b4b7b1918ffcbb9069e6071232402753f870195acbdf6d083826de870160648a9a691e5c0ccc781a9cc46ced503386f
+EBUILD lld-9.0.1.9999.ebuild 1757 BLAKE2B feb199a7eda6c979f17c990998241e61e7b0965b3706fcb5a98ff2ac3422accb17623008b2646fddcf26f28daa513762ffcbad8df469e9cf4ce3e8a78f138140 SHA512 673b939d4b005e652abe3b9e8da40c1c41f0fde09550b4619bd04dde4898baea565da6ce72205b62666da2efeed0f87096279013533d88d9fe42999747745cf4
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild
index 2469a9bd7046..9d1c88d828d3 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild
@@ -55,7 +55,7 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_SHARED_LIBS=OFF
 
 		-DLLVM_INCLUDE_TESTS=$(usex test)
 	)
@@ -73,3 +73,9 @@ 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-6.0.1.ebuild b/sys-devel/lld/lld-6.0.1.ebuild
index 0117f71487d2..e05fe0f7cc60 100644
--- a/sys-devel/lld/lld-6.0.1.ebuild
+++ b/sys-devel/lld/lld-6.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-7.1.0.ebuild b/sys-devel/lld/lld-7.1.0.ebuild
index ffb8fff0acd3..468b665c1f16 100644
--- a/sys-devel/lld/lld-7.1.0.ebuild
+++ b/sys-devel/lld/lld-7.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-8.0.0.ebuild b/sys-devel/lld/lld-8.0.0.ebuild
deleted file mode 100644
index a5009a3a1758..000000000000
--- a/sys-devel/lld/lld-8.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-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() {
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-8.0.1.ebuild b/sys-devel/lld/lld-8.0.1.ebuild
index a5e2b13429bb..5c66287966a9 100644
--- a/sys-devel/lld/lld-8.0.1.ebuild
+++ b/sys-devel/lld/lld-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-9.0.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild
index 224aa164a910..c938e81bb902 100644
--- a/sys-devel/lld/lld-9.0.0.ebuild
+++ b/sys-devel/lld/lld-9.0.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-9.0.0.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild
index 6935200f15c6..6935200f15c6 100644
--- a/sys-devel/lld/lld-9.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-9.0.1.9999.ebuild
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index f0d2624dfb7d..79ff3f75521d 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,13 +1,11 @@
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
 EBUILD llvm-common-10.0.0.9999.ebuild 733 BLAKE2B 1f9de93b6caf96b7a5bea067dd55dec75c61fe7f44904adfa262b33626c8a336896d44bb46cce14b1aaeece0a741eadf731e0be52688c2debb80f83bb12ba0d0 SHA512 a39e5d1047c1bb2c94e01062eab53920c5f07303d68f79b205cd8e2d33c173f717b7b2bed7edd051e7c77f934fa837250e51f1775816ee91d45244ac6f84bbf6
-EBUILD llvm-common-6.0.1.ebuild 838 BLAKE2B 7c30c7e7e52916af34728e11cc6e00e6add5363974affd53e7940bcbacfb3b7a73bd17d86b29b10684535ced07c0237909473c4500e2439d5824b4cbcf924d7e SHA512 d642ce674d3a0a742e5afaeb97a5e67e5a616ddd18642777dc640c44fc65c9f5d34c5e1398483c062152e87c9ab076b5518ad3ab5d39df9d1ce1331eb2784464
-EBUILD llvm-common-7.1.0.ebuild 835 BLAKE2B c2efeb392ea3f30d6c8a3fc24769dad0331d555c0dfdb161226284d4c7354148958162d929d062a3bbeee13e80b0bd0ebf07eed61be7ebad74d48a8be76747bc SHA512 0b663a260a31231706d089c921f7b4f53a617578dfbb6309384fed73ccd23ec06ba82094ce0c1c93e8e603317ac149b0a94a6a8bdfaf654abc9b7e586a6e1ad4
-EBUILD llvm-common-8.0.0.ebuild 839 BLAKE2B 9c75a82312a25919df8050ef435cad0452a4303cd4a3401d33c72d866ba463d1d87578f613a1d9896abca79a7bcb84b539fb18b7c1e00ef86345303e7230e298 SHA512 879c499c2420da38117c62bae7e8c68a810bfe74b6afd7c5d2541223f8476c6f2cb24534fb2d6f7d8d956e336a8e6e6db371ba97bfcf1938dbe0330a30b49c52
-EBUILD llvm-common-8.0.1.ebuild 867 BLAKE2B 897f30526c1b31b8a9d3c1915b7356b73b38e1d20ab3acb1824cdb9618ebc451f6df5d9f95d3658d466563aaa3eaf6e773fbc6deb4ebf9d5e0b0bbd62a9d64ed SHA512 a1c8c04e62eb52ff5021dd0073724d4e68231fee142e9f28762ea5e69f95605949f63db0cf68a211ae3f756c0ceb590bbcd47337aaaabfc5d1ef2dcae54cfc51
-EBUILD llvm-common-9.0.0.9999.ebuild 758 BLAKE2B 2f6317c0d24a961be87d31390448570908901a773aa2e7a93e3e01ad2bf1f473bdba044261405f0f34c369d60521519e1031be215eaba07f98a107b2ad4c2f2c SHA512 5b233105e8750ae316c48a65069912f582315a2dcb5dda5e72c047152a0955a0a008c1c2238d18c7f0a67d610a58906838704af79a9d17359f075e6f14e8f696
-EBUILD llvm-common-9.0.0.ebuild 866 BLAKE2B 20b867424b130be996cac935c4fb3407acfbe6b4f98842711aa05a8d094d9ac4a369bbee4157cc88cf6eae7052023c6e845298e42e589e49fd260c68fd8e5d76 SHA512 cd0e9e3fe6f65587566886ef99e1c3f80442640f79dbadace3b7904b48d314fd80189fffb520bab36f27a9b35e799e7817c7e3c081ea3430717cd5cbc6d47a22
+EBUILD llvm-common-6.0.1.ebuild 826 BLAKE2B c2f09d2ecaa48389fdccb1ba3d225aacdfb55afe18ffdb25ee245ed8942c0d5e01a275fc3ff46b50683ee4424b1d3c04c2ed588c62b05d300b2664b5b1c03b25 SHA512 182dfa879c2bbb3a698359dab6103d16b5ecb9900327e2f41e114830c32dd52224274d80866e3c6516a2eaed6b11fc77853be1cd0bca334571230c177b362bfc
+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.0.ebuild 854 BLAKE2B 7ba3438bc9652c079895bf882c7841e7dd17f0cbd42e64c777ee40b7f46467690dd63e87b52fc7df6672a0d73a97a6c160a59702b0d8c302c4921e678afabd46 SHA512 7c6cb6209583266105192897a13c9d8e870d9479d384c96be6c24584961287505186af140aff2e304f758dbdfd2f3be9757e564008c60815c1890658240550b8
+EBUILD llvm-common-9.0.1.9999.ebuild 758 BLAKE2B 2f6317c0d24a961be87d31390448570908901a773aa2e7a93e3e01ad2bf1f473bdba044261405f0f34c369d60521519e1031be215eaba07f98a107b2ad4c2f2c SHA512 5b233105e8750ae316c48a65069912f582315a2dcb5dda5e72c047152a0955a0a008c1c2238d18c7f0a67d610a58906838704af79a9d17359f075e6f14e8f696
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-6.0.1.ebuild b/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
index e9677df471a3..5f3bbef8c0b7 100644
--- a/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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-common/llvm-common-7.1.0.ebuild b/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
index 236d69e84a22..a7ec5caa3088 100644
--- a/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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-common/llvm-common-8.0.0.ebuild b/sys-devel/llvm-common/llvm-common-8.0.0.ebuild
deleted file mode 100644
index 5d3f8596005f..000000000000
--- a/sys-devel/llvm-common/llvm-common-8.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
index 0691e0161e52..f15962d7be23 100644
--- a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~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-common/llvm-common-9.0.0.ebuild b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
index 853c60a6914c..65eb4d232e33 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~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-common/llvm-common-9.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
index ae78e1164ce5..ae78e1164ce5 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 9123cf674af5..c93ffe881046 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,13 +1,17 @@
 DIST clang-roc-2.6.0.tar.gz 18831605 BLAKE2B c54b811afc57d42b32e6c38ef219eb8a1bdba47f2a58505249bf5057708c6873b28387c1fa05a8a6c1bfb02cb71b4ca96e69a72d9f0cc03bb393fa1033d86a41 SHA512 41a3595961eb4b57ac8b2d7483f53628ffe5f064a40a7331fbfa1daad2f1491e1062a1189a15a00586341fdeb73978db67c058a23e00982d32b987cc41a63b43
 DIST clang-roc-2.7.0.tar.gz 19030674 BLAKE2B 10c1a3982382edd3515d1dc342d352af3ef0807c92ec2e51740c5e7053df56acc9c467a3e1efc587df4d17852d3e1a9f0d183a5bede54339c2a67ff894b106a2 SHA512 c32b716ef0ef7c8b775b8d1cc65bb4d1b2c9daf9da7dc6a587affa303411923fe955aa6d4355a5ed0adb2d347eb333cf009d02384b00dd4e329008f9a1ffd249
 DIST clang-roc-2.8.0.tar.gz 19169198 BLAKE2B 94056fc7cf0ee07f921b9f92bea2844409d4ebd5b6069320dc465ee626695f3bbdf5a7194ba562df8f1c69e2c95461eb6047a6d28e57f881bcaef4cde7a95eed SHA512 b8b7d2172d075298c44f238b26231b5744a9d303115e791f24eb273b719df54673e76dbafe596623d60d8a72a7d4b0f5ca7167f061c7e235f0ceb4b7e18bfb95
+DIST clang-roc-2.9.0.tar.gz 19168986 BLAKE2B 2a5a70d54ac468d979b5593dcff3e7d06376c7e56c20beff1c27c807057133d7de60908d404ebccc535a26eebccb3e95998b65e5ab08231b5b14f64e4a6c702d SHA512 b8220562a9f691293660c0e4c12073ba7e40a653b27ab8ab12bddda009e83a761fb3b911578c8955a8467d4647fd3b1e92c841f3efd412a1f06fd1746f045057
 DIST lld-roc-ocl-2.6.0.tar.gz 1508227 BLAKE2B 39182669e38ec21cdd30f180981631abfa55c1ddc9f923e44f251a12e27da55409d7dfebd454b2706c88ebc0259455020fbe5db8d3543a353810bacde2396104 SHA512 19f300760be83c165a03ff2d48b014b3bcb3f7703c9430c3146b964e23ae30ea07ff579402bdce613e995004b063bced7329719e801c585e6e885b0ab473ce8a
 DIST lld-roc-ocl-2.7.0.tar.gz 1533671 BLAKE2B 089cfbc3b68bd6192d6672b60fdb499dd117beb2f407c3af0e979dd9a84203212a19b30c43ae3e495abba8c36f4c3f556af72464a75291484231d418bc7a2897 SHA512 ad880efcfc08f767fb86614d826b58ed575fdf173d7b809d31ea84a9abfd12f7f60da719b5ecb8461b792693d9c3d6cbfefe902f2d2e34d062c88d1b3b7d6c79
 DIST lld-roc-ocl-2.8.0.tar.gz 1542424 BLAKE2B 3c7e11c6de2a6915a975a9e370380e0812f1dd02230ce1c3035c4664e6a6bb8093c2ddc2c6878c75761060ee1e7d4e1f6f11c09a496482132352d4e4304ad1f5 SHA512 6f4a7b9786ff76bb054446d09835611927ce366d1d0e6bd037b3b373afaba2e26e743c1f6a99234474fcbe97fa1c5f5379fe887a5b0ce5b346ebd96ccd1d732a
+DIST lld-roc-ocl-2.9.0.tar.gz 1542469 BLAKE2B 15305d93e992381f82c30602d96ea356c215b420ae3ed690b6581d6139af3b5e507ee7a223b1bdee29ca78e09b57bbe0bb43b50ca94268cc8ab0e0f1832706d7 SHA512 b324adb532ab53c5ebb40c976b55332b41220c7b220c1b7fda656a8d56118a32acb25cd0949a84b08e8f8aaf7e159faea7c70c7f35fb2519834d9380d280e02d
 DIST llvm-roc-ocl-2.6.0.tar.gz 48417665 BLAKE2B 9b7ff7cc57d98b2076994d3a5585563430fdad5975b89459aea34d585adf330d3d49d2ef611a70fd546878d84bc64d2c196dbf9f19e78ab2b4a5e63266ffb2d3 SHA512 89d5c97b8bf97242d72176768f8d12b218ab258fff9d154e3c3ff382b5563c2d6997ee5cf145e5f2c34e2cf4f9dd268906750a014a874a2038683ef5f173b872
 DIST llvm-roc-ocl-2.7.0.tar.gz 50008043 BLAKE2B 7cbb6f0e268991bbeae6dd5f38f00ee35a3d04f563212a6a3c32676574668ca84e44ae5acc14d1a77ea6985e70b47a0faff86d86521fb3a7375aa58a043d65ec SHA512 ae1547d1547345be56f547c59a6ddd09e68bb1eaea1f3c8eb4911dee1f2616b43384a296a2e2754bf2a833ef4906da4463820e4fe734c3bcfd7a602ef3c2de17
 DIST llvm-roc-ocl-2.8.0.tar.gz 50245388 BLAKE2B 29aa4fdb08b5c3ca1ec41f8948b48d4655768632cd07b217e742e32fcfe0e306130697cd18d4c481aec440686464271b380b5a1a7f02bba84ee8cb98c13d2a7f SHA512 51eb98160d556aa0b60fdce95af54f57529e218899874df0a59e583dad5a8fbcad822c3d778668ce0ec4897b28ff3423cde4d55e18719cf4edfb56735cb3d80b
+DIST llvm-roc-ocl-2.9.0.tar.gz 50246154 BLAKE2B 5ed8faf4582a41dac3bdc71a9fc6e12e3f70652fe80d4659315589e5c6f6326bc03853cea1d3e7acf6b210dd4c83056bae27aded3e173756d6f7c2c5694ae386 SHA512 e29767bb92bf719b7f3b6d2853dc61d6cb968e3f0dc54714ee6a78ff5340139935ce0d1cf3124c5757d96f93af01e0f9927e72d29a35b84229e44e7a69e6d391
 EBUILD llvm-roc-2.6.0-r1.ebuild 1397 BLAKE2B dfe3cfa05e3c6821bc11e0f84ab00cc99d92a7ddfe162127d96bbeaafe799eb802eb88c6598f3a6e1985848800100cd5f74d1f984607e784981545171cd81b67 SHA512 75fa6b120685a0a284a8e18403580aed74bd1597464c686623fb9bd3c0fdd0930eb11f4f0aac69790baf5038af368195adba3a7c4291b13b7d84b934b537e3e6
 EBUILD llvm-roc-2.7.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
 EBUILD llvm-roc-2.8.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
+EBUILD llvm-roc-2.9.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
 MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
diff --git a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
new file mode 100644
index 000000000000..7cc195bf6554
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz -> clang-roc-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz -> lld-roc-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="virtual/cblas
+	 dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+S="${WORKDIR}/llvm-roc-ocl-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	ln -s "${WORKDIR}/clang-roc-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
+	ln -s "${WORKDIR}/lld-roc-ocl-${PV}" "${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
+		-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
+	)
+	cmake-utils_src_configure
+}
+src_install(){
+	cmake-utils_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 2cbcdf5c340a..8fd8e3584de4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -2,25 +2,21 @@ AUX 6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAK
 AUX 6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch 13865 BLAKE2B 03f677e386115c3c7333db39664f75b2b4c22e18c2e487e515dc2a55acaa1bf569d2945ae620420b4b4323fb2e4fb7d3c3313dcc7e648942afa25d055d36efc7 SHA512 2820793ef29f08b55b7d94ef700085dce02c6a029c5877a77c5296e9a05dfc9946d10ee66d2d3d8a150cd511e3346d2acf259b873aeed25c1b0aaefebe95790d
 AUX 6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch 4263 BLAKE2B f0b073f90968b008ce758a43f00a4268dad1037f949704f3d86741319b6972d1ad69bed0944152f21b837486404948c1f290babc90a4da5ac0c300f0d2a868ee SHA512 efcb4b4bf0320304df680e6b69d8db1e732539e6cde0d9f11566e00533ecf8383d1520edca0a69c96e1722b33dcc8bc33da23470faf59774724cedc9f522d9b1
 AUX 7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
-AUX 8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch 1452 BLAKE2B d8b9b34b077bf33fd0fc6fb50937f5e9a8b90730fee3b6c08b5e0659fd37092ad073580ded506fbeba4fa3503f0ea6104d7adefa41f7eeef9a17a3189ba1212b SHA512 fa2aa9bde1b153f42037bb864b1a4dce0288f567c6a116a4005e45ca322808041562c2d2cecca5e3d84e44bf73bed600a05dfda85107c164415912ef60141dab
 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-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 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.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 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 llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD llvm-10.0.0.9999.ebuild 8589 BLAKE2B 7dfa447685c16a5bdc6483a9361f125b0f0a485250bd14d480ef6870cdb7cd235370c8e7864ff3f985b45a979c62c294dabef8a40c381f0559155c07c1185ecb SHA512 7e9d69f66d84b09f6d05fe845ed97be71f35fa7b2af6306daf6862c7d2836c0350f95cb5fe5fe8bd2042b9eaa46b9a78d0be1c1716e04f6691bab1915bcf340a
-EBUILD llvm-6.0.1-r2.ebuild 8223 BLAKE2B c19ea8293cb393516560805dca29834a5ad57a9b9892c4f2d18d13b7031960624e411d32c64715cff1b0ea42c667d362d06c21f453258c8d7924abba61c566f6 SHA512 46f510c491a6ac5791f5d368d9d3ac0694d12a8c061158050ae3202d275cb1002f6b28fe38a0ef3d0d3f96e2d86b4f1bbe0412beb5bd9494376c9cb425bb0b7e
-EBUILD llvm-6.0.1.ebuild 7878 BLAKE2B 2dccaac410eb5ca447df7ba22891b05ba4767037239a321ac8314cce46ca18306885b5b90b3ba52092972dfad9f11cbac4285c8cddf9645a7c3bb0d1b77509d6 SHA512 77117eecea99a8ee65b5fd4c7f0003186b777624af4d0eb4fab1b1f2c5c02708a30e5f9952371452b0da933247b75e18cf2154a8cd40ea2fbd65a0d7dea4c987
-EBUILD llvm-7.1.0.ebuild 7833 BLAKE2B 7e96495d3e0d4dfa095a1ed9bb1dc065c7ba6606550f205cde21c54b6513322d0d5de7430a84d52fac960bc86ace5b61a6818de72fea7dbd16f9478d487dd1f0 SHA512 384d5eb9b43a1b519c73d3992a97e9364ab86f00025cbbaecdd96439e77865d6b5f2327ca0fd6e524b4df9fd50f7709024093f0455c5048a1701495936ca5080
-EBUILD llvm-8.0.0.ebuild 8796 BLAKE2B a7761e6533e36d575ec859125fa4e1ea8d56a0b6b69d826100dac66f5fc7540ece7690f82a51b973bb34fdcb8585466fd040d20b7db3a843761b40a6e8dc0c49 SHA512 ed6ad22908ae370b98896e3e1a8e99fe78c22348fb1dbebbc7b49ee51b68cb0d80d8c87f83d285a48dc89a0486137178560cb1c495bb4e5f09d3e89241f5843e
-EBUILD llvm-8.0.1.ebuild 8642 BLAKE2B c319238b85346e3bffaa8c4a2a6e373e59c28241682f6a27ad6207389472a918d396d016381ef3f4ecb45d6ec4695ff922560c5cb936d0ff6fa9776b33cb663f SHA512 aad2b70c31fb1af9a093488596a3601f139034a15fa3bed3040ab16a75772a94261589e0e465bbe73a7214d63a9eb467ab0c1cb2c42f8cd49fff1571368ed00c
-EBUILD llvm-9.0.0.9999.ebuild 8289 BLAKE2B 4e63e11f29bd3b88382963ffa8c125308e101d946cd28d7493a2a2e4e7d6180514154310b007f808922d9ab821e9bec70c1cc4f7a3b78fe5354ddf17e21f6ec6 SHA512 49aacf1f630431bcefdaba3bdf34ceef5cf97f363b81937028608d6ee62ea6367309f7f4a3fe9663b5fba35bbc20945a6d8f822e22ec9bf7d518816eff67b8e6
-EBUILD llvm-9.0.0.ebuild 8603 BLAKE2B 585e551c372c7e380588c3d6d3353adbbca1cb16df45290a76830c257bce70bb7ecd21c371d48dc9d474f54ca64f18399c72683384fab1b1506a7d32379333b0 SHA512 63e555a79a8fe0416f49c7b8b03130fc662494b53e84213a0d16f4e7533750614d5cda76415ff8a2becc3f1abb6dd1767dac7d8169e2583b26143363df5d519a
+EBUILD llvm-10.0.0.9999.ebuild 12638 BLAKE2B 4274d77376edb411eb9db36d2646ec33ac494447f8f6e1f601a9f91bbbd3c1788be32ca6fb088cd2690e7840ba941bdf5b4a76bea022be452f05c09278a88c20 SHA512 1edfcd2156e17af680f0f4be48bacaca1f5b8ea01fe5dbdb86702fb1cc574f2413df63bf59af8250348fc35386b90bed46e2e9dfcf2ef55b76afb85170d4fc3c
+EBUILD llvm-6.0.1-r2.ebuild 8211 BLAKE2B 78c9a44c232d0522d52cb1901cda93ef5dcb5df1c8c4aa052122250f9460ca984219c41dfa311a15585637aac6d03e698e15fe6af5ff4273f9265f805e1faf01 SHA512 405bf67ea2457ad0df9f9476d58836685634f5b434cda584c913c1e37f2ba803c2995bf5538515b73bc991a1ff44dd28fa004a459ea86b7af7c2bc23564d0619
+EBUILD llvm-6.0.1.ebuild 7866 BLAKE2B dd6136d06da729413062835ecbc872a8b734ae680369180b19c179067f0cf93bdac82c56bc4954a6cd34c406adaa41376466e496d9fcc1321635de386fd11bc8 SHA512 c0592f651d2db40307bbe2dc499fdf0578b271df30162c5dedcc35ae2022e95efe75d8604a7e12dc2e24e9be937e12bb97004619832f0a2529ea82d78cb42179
+EBUILD llvm-7.1.0.ebuild 7821 BLAKE2B 39820b1dfafde7810aaa2e5851c6293cbe39ef4961a2219ee189d2e8ecbee73771c3f24d356c9506adfdca1ff66904ee394dc3c5ec06b394628a130c4d309b2a SHA512 df4c8f686f6cf0a54a733eb449e9def48bc4baafdea2a5feea2bbec78573ec070a7bf679ace0e27db3cb64babb8d5c9977ee56da67cb7328584d1128c4fe6329
+EBUILD llvm-8.0.1.ebuild 8630 BLAKE2B c0b2d7ea039431c047607492b6f9be8852bd472623e893d624905286b29344a6c5b774671d19a8a18cca9975a4337c218cfc6821cf338000d7985d88a44a6c5a SHA512 23bbfce6f6ed1547b0ca01eaef78f5f7795cd1c5e202e1d625373c36cfb02ee1479c5dd6113f77513e80154644f506581114c7b4544d533e7ed82eb289338415
+EBUILD llvm-9.0.0.ebuild 8591 BLAKE2B d45d52e88d1c7101c854379bf4cffe3cffe8ac617df961e96e9f9670e64f10eac7de21bd714401b89b52b4e27e6729892ac185ef5f78fb04ff9be21f3e694bc9 SHA512 7f99235ba3b502f2f0c444bc6805c2548025b1e1b807719b38f4bda390206cdfca57b0326ada624bc3079bb918a5b982f0961f48e9a4fccd739724a7709f02ba
+EBUILD llvm-9.0.1.9999.ebuild 8289 BLAKE2B 4e63e11f29bd3b88382963ffa8c125308e101d946cd28d7493a2a2e4e7d6180514154310b007f808922d9ab821e9bec70c1cc4f7a3b78fe5354ddf17e21f6ec6 SHA512 49aacf1f630431bcefdaba3bdf34ceef5cf97f363b81937028608d6ee62ea6367309f7f4a3fe9663b5fba35bbc20945a6d8f822e22ec9bf7d518816eff67b8e6
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch b/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
deleted file mode 100644
index ed83244de53f..000000000000
--- a/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Thu, 4 Apr 2019 14:21:38 +0000
-Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist
-
-Modify the add_header_files_for_glob() function to only add files
-that do exist, rather than all matches of the glob.  This fixes CMake
-error when one of the include directories (which happen to include
-/usr/include) contain broken symlinks.
-
-Differential Revision: https://reviews.llvm.org/D59632
-
-llvm-svn: 357701
----
- llvm/cmake/modules/LLVMProcessSources.cmake | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake
-index 7cbd2863500..d0be0e8b3ba 100644
---- a/cmake/modules/LLVMProcessSources.cmake
-+++ b/cmake/modules/LLVMProcessSources.cmake
-@@ -30,7 +30,15 @@ endmacro(add_td_sources)
- 
- function(add_header_files_for_glob hdrs_out glob)
-   file(GLOB hds ${glob})
--  set(${hdrs_out} ${hds} PARENT_SCOPE)
-+  set(filtered)
-+  foreach(file ${hds})
-+    # Explicit existence check is necessary to filter dangling symlinks
-+    # out.  See https://bugs.gentoo.org/674662.
-+    if(EXISTS ${file})
-+      list(APPEND filtered ${file})
-+    endif()
-+  endforeach()
-+  set(${hdrs_out} ${filtered} PARENT_SCOPE)
- endfunction(add_header_files_for_glob)
- 
- function(find_all_header_files hdrs_out additional_headerdirs)
--- 
-2.21.0
-
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
index e632d6c930c6..77a6c8423834 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -18,7 +18,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
 
 # Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
 # 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
@@ -59,6 +59,7 @@ 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 )
 	)
@@ -90,6 +91,94 @@ python_check_deps() {
 	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
@@ -98,8 +187,14 @@ src_prepare() {
 	# 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++?
@@ -114,6 +209,122 @@ is_libcxx_linked() {
 	[[ ${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-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
@@ -129,7 +340,11 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 
-		-DBUILD_SHARED_LIBS=ON
+		-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=""
@@ -221,6 +436,8 @@ 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() {
@@ -260,7 +477,7 @@ src_install() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	DESTDIR=${D} cmake-utils_src_make install-distribution
 
 	# move headers to /usr/include for wrapping
 	rm -rf "${ED}"/usr/include || die
diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
index 45ab641dc664..01164ba7d20b 100644
--- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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 gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild
index 395441ba7a47..ddb059014c50 100644
--- a/sys-devel/llvm/llvm-6.0.1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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 gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvm/llvm-7.1.0.ebuild b/sys-devel/llvm/llvm-7.1.0.ebuild
index e785407ad282..b6ac1a5fb260 100644
--- a/sys-devel/llvm/llvm-7.1.0.ebuild
+++ b/sys-devel/llvm/llvm-7.1.0.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~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
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvm/llvm-8.0.0.ebuild b/sys-devel/llvm/llvm-8.0.0.ebuild
deleted file mode 100644
index 598c0b679199..000000000000
--- a/sys-devel/llvm/llvm-8.0.0.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
-	multiprocessing pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
-	kernel_Darwin ${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}] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	|| ( >=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}]
-	') )
-	!doc? ( ${PYTHON_DEPS} )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${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} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# Fix failures when /usr/include contains dangling symlinks
-	# https://bugs.gentoo.org/674662
-	eapply "${FILESDIR}"/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
-
-	# 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
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-# 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* ]]
-}
-
-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=ON
-		-DLLVM_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
-
-		-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_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() {
-	cmake-utils_src_install
-
-	# 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 - "10llvm-${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_
-
-	# install pre-generated manpages
-	if ! use doc; then
-		# (doman does not support custom paths)
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
-	fi
-
-	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 2.7 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-8.0.1.ebuild b/sys-devel/llvm/llvm-8.0.1.ebuild
index cc7266ad8ffc..9a04aa34bb2d 100644
--- a/sys-devel/llvm/llvm-8.0.1.ebuild
+++ b/sys-devel/llvm/llvm-8.0.1.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~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
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.0.ebuild
index 8cd42b405ccd..62d66ff6800b 100644
--- a/sys-devel/llvm/llvm-9.0.0.ebuild
+++ b/sys-devel/llvm/llvm-9.0.0.ebuild
@@ -31,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="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~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[*]} )"
diff --git a/sys-devel/llvm/llvm-9.0.0.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
index 5ff9e20d7e12..5ff9e20d7e12 100644
--- a/sys-devel/llvm/llvm-9.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index bf34d415c0af..9d59e9a7f9ee 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 1620 BLAKE2B 789c68b68c8265b799623fede4da9ab2aa344b67972d8abe220aa03c80732425ac474cbd01f0ac3538f8b110ce6dffd5d8844b9cad079cdde5fa283c9216e5e5 SHA512 e5642fde4f5f83daaeac3ab340abd845285d90320ac9c72b4465de4c06c05206c5bc9a3208f1fbf94609552b264de47ee1359e07b0d2c791cb160a4be605ff72
-EBUILD m4-1.4.18-r1.ebuild 1429 BLAKE2B 208968583134a5c8d0a5f4d01470cfbffe10dbe16206ca0a5a9e02857665d6ff080fd520ad4526decfa08be299d084eed0552905b7525196dbed38562c96498c SHA512 3c94fe4b75ffe01a6a3c41d3c93999f4799417d7505560602ef0f3b1db4ee878b0e1cd745ddb394bd0486756d98bf36b36d3143fde7c27fbd61afe5d2069b121
+EBUILD m4-1.4.17.ebuild 1598 BLAKE2B efa3eafc363909d30709d36312b7bfba2439f1daf36f3086d7b32024cf2d4ae6e8a2f91a988fd990bc8663d2300120099be2c60aa2ab6722a7b3e4409e8449cd SHA512 28b45669d413df24545496a1c911ec7d9d23b860a48a74aad5b6dbcca960476ff73545cede89c7a9426fe80649233c9633dc0388feb8984894b19c480fb499ad
+EBUILD m4-1.4.18-r1.ebuild 1407 BLAKE2B 471f56a5f32caad6cee17229c6bf482ee4ea06dd62e07255e15e929b6ccd8bc963a04248d5a143282164a09cc35c2f8dd7acd9ff2bc32fa53a41274456dba99c SHA512 ce8c783f8fc3fa91c39e71eadb644a2b29e684f88eeab22c97b236dd53645eed915d7ed8523cea655050e888b1a3051efdc89be3bc9f005d0e94f46398a344ed
 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 19347f7bc175..bdd11320b631 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-fbsd ~x86-fbsd ~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 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"
 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 52086c40c4aa..a561d7b30a80 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-fbsd ~x86-fbsd ~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 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"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 1eff61060d4e..863915d0efb0 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -6,5 +6,5 @@ AUX make-4.2.1-guile-2.2.patch 11401 BLAKE2B 0bd3c4d813d0205eb2a204f4819fcad3f18
 AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e
 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
-EBUILD make-4.2.1-r4.ebuild 1711 BLAKE2B 582b377c7c5d2511d41cb4d74f1ba2c14559c8227d3d52e6bdfc5982ca9fdcc0e9880fb0ea5d21f9f7039a83a97118d6d61bfdb3fdee36af0fb950ed580e4b4e SHA512 43491bfe0c118190a32f16593cb4b46a6aa7ced5ad13017ea9a066860ffd1729ee94d4320d73f63d77523ce3175bc4f8dfd25eea93939f5cf3ea26d34b92c0d9
+EBUILD make-4.2.1-r4.ebuild 1689 BLAKE2B 26840c55a07b8eb2e9e43fbe4a3079a5f7d393b9fece6e306cf00b2be7768e80c113faa75d24d26047210cc9ea8ca4ed2dd6e1e6d3ed0eee0f6deb7d6819e860 SHA512 cafd92f60b09fd84f5716472eefad50a090cb0d7630c8e145d6d3cccbb1e142efd463a4adbcfb0e0f8a795cc5bf9ccc437a1dab6d61c25dc5dfe5a1d0077a1d0
 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 e6baaf88f00f..970ce1a358dc 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-fbsd ~x86-fbsd ~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 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"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 8b168493e102..2919bf9ff77a 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 1679 BLAKE2B 7a5facb177d8ab7d160abc12abf4b1dadab2607f998d9bc53977757d27f3c9c33ab9c00a85062fe6b5d136675ddc895e9c47e0a30abdc51dde871652d8b88fac SHA512 51cdb683e5b0f239a4a0612503a2a6a1498a8686cf2540601fcc93a2bbdad42597388d2478c52926413653c7cb47d7f8da9cf70f50597039191e50db1aaee861
+EBUILD patch-2.7.6-r4.ebuild 1657 BLAKE2B 50521e6bb18a65a68eca9c7a265b22164d3a56be71e298079b202090aa0a8fdf3b17701f46ba5871f5f996d959b7f59b69874bd971c2612eb49fe748e5ceb988 SHA512 9bb9ebfdb06c5a59327c0066ad44a6be8dc5db8605fe784e0160ee187e0c18039972fd8ed0cbfb72966bd5df30be53a96e2da4f06e03d85007b7a90d922151bd
 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 b480b40246ed..1fbe08e714b4 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-fbsd ~x86-fbsd ~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 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"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 236fcd205f45..76f90d601ba1 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -5,4 +5,4 @@ DIST pmake_1.111-3.3.debian.tar.gz 31648 BLAKE2B 31aca433bbeac4275d4c2af0cfd33ef
 DIST pmake_1.111.orig.tar.gz 264383 BLAKE2B 54dd510251441b54c9f5d7f6061109b0222191b3acdded1394b51b72b87bbd4255edd80fab46976d92c58929693b6809a9f2c4f001cab8c9cdaabfac9f3adac9 SHA512 ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22
 EBUILD pmake-1.111.3.1.ebuild 2361 BLAKE2B 13c302eadc35b53b945c8a5d04cad8f2d69e42ba5e111b0f2e5eeb4e84a65c39b43d4821e92d622513207a851bbfc4e3d9acbcde948610d11511b4da11fc2ad0 SHA512 8c94e3b2c70193e10663caaf3a456b88c9e3343c6d1bf2dcc1640bfdda96b1ad703b655b7db06ba7b29b9f74ea0cf7f25744b8afa52ed0b4befe36f8950b5278
 EBUILD pmake-1.111.3.3.ebuild 2379 BLAKE2B c735f404dc8f61a7e80b27d66c8da02108b5f8bcee622166a2de835090bd4ef9c334430977dc28bb21553ba62e726758e13b0047475083a46a50fee4c9864aac SHA512 372899a6500e07f6b7af455a0b74a0e9e778be0346f8dfc0817caad25cc6aea7d98e369f820b84cc2d75cc2098b78621e6be002e032aa34c3ba1ac6ca77edef8
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-devel/pmake/metadata.xml b/sys-devel/pmake/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/sys-devel/pmake/metadata.xml
+++ b/sys-devel/pmake/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index 07675704a584..01246e840903 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,5 +1,5 @@
 DIST qconf-2.3.tar.xz 51848 BLAKE2B 836f22e50cd4c9bb2beefd85d0e5f85f7aee40078dd4a696492c344ae9dffeae20840025a3262b5abcc2c74b22ed9e0bd4b44d077b83ab1e904c0a93bde394ff SHA512 27a532cb52067707a3e04a40260bb0f42e40adff4a643d2f048832356de58271e4051c9cb810e6fffd4b4e45dba483ed65aec062506053caa262ac03b3ec6253
 DIST qconf-2.4.tar.xz 51880 BLAKE2B c87a2a6dbca56fa52bccd0cdbbdba64013adcbf03c6cca6744d3e1c3166f74a09e945022854b1143e0c08a70a6124c0b890be8d7f9d4a91be7c6c0e2c89bf800 SHA512 982ace9e1d30f6c92078d661e103418fc7e3352a56eb78dae64a004e563f5e7bbf8f71972ca482e2f5229a6f88bb51372e543833f99c4b596d0ae4be5f443317
-EBUILD qconf-2.3.ebuild 826 BLAKE2B abfc88f8a9c9b954b5ea6b7e235fb804da1e3ba9f407c80fd0c884c436b9bfbe95b5ed40ff7d5c45ca4e1b0a5ce54d3db497c31cb144a1660acd1af5b2f28714 SHA512 89193bfa9148fa6532ee3dfb8038089213a17e791755dcb9d8dc8f5accc88562d08d414acf0c5db3f276cf20bb2d7c41d82ac23a154e9c72019e313affadaa77
-EBUILD qconf-2.4.ebuild 849 BLAKE2B 7d770f0dba8335a0c3a1ac1e15e5d44841c3a4efc801b79562ce89093b3cfa15746ee277fa1d02a8b4d831d952c6e7a20c5027b5fe5f0bc964f4d56ba136097d SHA512 4ef52cf79bce9521679325432d7c56fb55875057d74655a27ac779071225d0eaa2e9f8794861af77871ed3a1f1ba6dccafb104512a353bcd06df85754338f6ed
+EBUILD qconf-2.3.ebuild 816 BLAKE2B d9b6098f799e41e2626e8dd4c30b63d615700f5b27a1c16e3aaf5c3f0f37082b96dcb311c0aaf73649ae06f72c695325dfc8352dfce08fb4c7945656bdbadd14 SHA512 965c0f48f3de3c2947736248e48988365c4b48e76f519c4d5de7f8a51baa62e5ca421a9fe012a51732e29f8552414e891ece6ec939393a2e8127ee4f476e142b
+EBUILD qconf-2.4.ebuild 839 BLAKE2B 93d7b63e9fab27f6bdb5f30822c779056d156451042d88b0094970444880cac770c34f5dd621e0a482b813cd8f27e16ef45869ff91eb1537c19e7b9a7dfd6f44 SHA512 121992c1f91042092767f00c2e695918015d792e071ca135ae5d5675411ccbd70a56d35cea703b0439b4067517adbe4dbf5103684d2fe090fd4a8166b830915c
 MISC metadata.xml 520 BLAKE2B f9a6c120d33a273ac1bd1d2be0b6af7eeddba959966af10812136a282acf423c17e14f5727dbd8a6cfad84f977e32695df43ae5bc9b13bffdd398b0ca27cd596 SHA512 d707a3c441702da2b0c4a6313acc4441fbd75e0b02990c9556a4d13906a8383683c261dc92a5c6f6a3593fd6d24761ea246110dd4514b4a7249bd6eda19b19cb
diff --git a/sys-devel/qconf/qconf-2.3.ebuild b/sys-devel/qconf/qconf-2.3.ebuild
index 40ddf2a32176..4292f0c9508a 100644
--- a/sys-devel/qconf/qconf-2.3.ebuild
+++ b/sys-devel/qconf/qconf-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 # There is no one to one match to autotools-based configure
diff --git a/sys-devel/qconf/qconf-2.4.ebuild b/sys-devel/qconf/qconf-2.4.ebuild
index 8dd2ae4e5182..ba6e9b593c20 100644
--- a/sys-devel/qconf/qconf-2.4.ebuild
+++ b/sys-devel/qconf/qconf-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 46f34bcc25bc..92b282f34ff4 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -2,8 +2,8 @@ AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fe
 DIST sparse-0.5.1.tar.xz 215144 BLAKE2B 209aa7cf34a9135dae38466a0ba41ff4fb888c363ed59a68a5820d4b6ef1636d717b8172a6d638d9dbc61197efb7a3e06ef85830b6f1c359737520b4b3aa0fbe SHA512 f7fc516ef8343a4153b9bda1b50b326dcd55a77fce5acccd9aa4c5636d6510573c7e26b0a7ca1df847082faf2be2d292336ad1cec855e395703a6b1e04d3a8a1
 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
-EBUILD sparse-0.5.1.ebuild 1292 BLAKE2B 548dd51d1c572e6a0aa775dbd30dbc70586d7c06d8dceb197f0d466a7c003ba091d0b9a9e6b777059fbcacec9ba40531d8b6e150dafbb434b0e99fef59e11cbd SHA512 fde8ddf89ffcb83d9827d133f9f6efedb4126ef8a8e77227d5e0e94710d238b5b64a078ded0e386219d5a4e2c7b90ba9edab856b3bef762ad35d5a36bb488d99
+EBUILD sparse-0.5.1.ebuild 1303 BLAKE2B 4c5dda7ea4ad17e8b6e5c5a545be7016a829a95df614214f203336436820790a16d5d1b976746126020b7856b53297feeb2775c69cc1aa77eafcefb93c465d59 SHA512 6ac6c6db13661ea893b081d922c1e78de9210ceb9a087bd58b99d64b560b0a35f20f699b2e9fa263b65f0df84e51b9fe0f7b1dd2c2c0b50ae8cfd5786ca6a865
 EBUILD sparse-0.5.2_rc1.ebuild 1379 BLAKE2B ed99626abd55719915eb0dcc471840e201718b1b93c0f3f814a2d89dfa23a5149e060a14ed3670ab8877c36b368395e88e6ca1f3d648782b722399c77fe38009 SHA512 89ab151c9b25373b9ffda84092365f164467400a69c4defdad7829dfbc57996be67054f719728925fd5fe0f6d31038b38d625f34d937de3df8579d2e676c195f
-EBUILD sparse-0.6.0.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
-EBUILD sparse-9999.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
+EBUILD sparse-0.6.0.ebuild 1269 BLAKE2B ed34c2531f5f461253f159b13a0c0b6f57481599f530596f1ec29a1dbf247c6279e044a41a651a1cb4ded7bcf0b73cb91ae31ffba5f8473e94ad87cea3685e0b SHA512 44d03a8e23843ff3e43bcd16885e5997674a8d0ce491eb5d61598884f139637adc7f87a4b47cb6fc2e8e931e0095d99638335f0fb1163864cce074fad167376a
+EBUILD sparse-9999.ebuild 1269 BLAKE2B ed34c2531f5f461253f159b13a0c0b6f57481599f530596f1ec29a1dbf247c6279e044a41a651a1cb4ded7bcf0b73cb91ae31ffba5f8473e94ad87cea3685e0b SHA512 44d03a8e23843ff3e43bcd16885e5997674a8d0ce491eb5d61598884f139637adc7f87a4b47cb6fc2e8e931e0095d99638335f0fb1163864cce074fad167376a
 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 a2645e713084..75591c9bf3a5 100644
--- a/sys-devel/sparse/sparse-0.5.1.ebuild
+++ b/sys-devel/sparse/sparse-0.5.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/${PN}/dist/${P}.tar.xz"
+	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"
 fi
 
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
index 41c95d2e55fe..3276afff1988 100644
--- a/sys-devel/sparse/sparse-0.6.0.ebuild
+++ b/sys-devel/sparse/sparse-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/${PN}/dist/${P}.tar.xz"
+	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"
 fi
 
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 41c95d2e55fe..3276afff1988 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/${PN}/dist/${P}.tar.xz"
+	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"
 fi