gentoo resync : 08.01.2021

121 files changed, 537 insertions, 2442 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3b3ee0566bd8..8c36be43a4ff 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 55a014a29432..a435461f0167 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 705 BLAKE2B 186befd9997845bbb4a4cfc813101998853043b53498732edda01e433e7376c2195c37fc10fbfc2500f2249ea59b88e02e93596ebfa1879a66425d9f049534aa SHA512 133e1e34855bf00d9f68c0e29d8d2ab78859b96f916eb2729f1b7b033f2fc5f88ee68b337d77275baa60849eec2f0710609e87c7bd025136341b9a7ad6873ce3
-EBUILD autoconf-archive-2019.01.06.ebuild 649 BLAKE2B 52a2c2f056f13374ac92837274766584bc6b2a618c4fc2766652cdd33c09c9e7fcf539d9acf71c3bba85b07ffe0831637f1673a868c29f82c57ca60dba0aa510 SHA512 5cd8bf249f0102e3ec10f4b03a681c4598e2bcdac3e29adff5537b1c9f7c1b8443607494efcd77867e97e03a31b6b3dcb20bfcb832b27f106144e753255ea433
+EBUILD autoconf-archive-2018.03.13.ebuild 694 BLAKE2B 7ff4ee4976a021ffcf185d71f2bd13aef33497a9a3ae1348d3c16f3d9103015e90bb9c4e7754877ef7f54b463becd40b0a673a620286e03b9256c6c91aaa3ad8 SHA512 8199ca1f4e2f52722edbb70cc463e33f03761ff34f2957d0417b8139b3854e5020c1151fe44e0cb1f819b2dbe526249b06b81d4a02c1d4a71f97e52109ca6873
+EBUILD autoconf-archive-2019.01.06.ebuild 638 BLAKE2B c4d9512fb6f7bb664e344b336b20aefc419dc585d49f44abcf3ebd27c3bd948c34dbae7ff625d3f158a3df88ad4ef0d1844a611d97df11b6d1d3d79fd9fef577 SHA512 e13fb0f9af727761b4aef1840bce73029f7f9adf1273958c731d2fdb04090bc4b6f224af093eaafe04267cd638f53baae56438dfed6c6eb0a868bbc7ca268233
 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 0f8fbc214da3..95f584a8b09a 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 1d1b30aa2c8f..69958439af22 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 9d9a5c44b01d..11cacb6845de 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
 AUX ac-wrapper-14.sh 5093 BLAKE2B 4ce76b0eae9b7be9bbf4fbb12dacf10e9c2731c13f2e708feebf583c9a7c88a9985cc992c617c5e2a30772daa61bc05391196c1d7ddebd4f1269b60c4038db60 SHA512 868751a8e73e6994fef500df37d5a002445ea3da6d68affa8aaaa5b00a8a913b08c4576ca030d578686d97e1b237defa735a46c03b9655e65e38c625488fc9ec
-EBUILD autoconf-wrapper-13-r1.ebuild 796 BLAKE2B c2819720c91b82fe3d6801470dac7f2e489e13f12123f66dc92f0015ad8de429fca3b0ca31e32598633021221f2503e74c4de8040bb197b95e83ac63211b1d7d SHA512 e528fc5b7a7bfe5aacf23b5ab6f9947cd7b3dff2e3020b845ba75acc2b663acad6dc690a0090e9f817d30991423b9096b61eb64a6377a1ea85d2dda4ec0fa4ff
-EBUILD autoconf-wrapper-14.ebuild 834 BLAKE2B 89ad884df6ce11a78cf7998907a83f31cee40259a9a1c6ee6599f54bfc2043dbad9c28230e6e9076a2eb3a556c313607eb6efa5aa6afff4ccfdaa6e07d434d93 SHA512 44d835072dcb2fff7142620f4d938ee2f8094aadbccb5bdd47aeb92c4be55aa9a7268dd9265cc437209e9463f1dfea227bb8a08047032c49cb218d1975e7e346
+EBUILD autoconf-wrapper-13-r1.ebuild 785 BLAKE2B 5b55a828dcc7260f82d8af38f4237a8ab05749bd71dfb66e1fadec59e989ea66aa49aafcd55dde54d9e34ff2096cb573d077dfd32c3cd204de6c0391d66bb4e9 SHA512 8a0c74419cac7cf8803dae5faa09cdcb5f69cc700490f7a11b05125bc0682a49bbe6346f7edd6f5676f7f85046f5a1ddc4bf2c8f879b9164797b3f74f1b5a248
+EBUILD autoconf-wrapper-14.ebuild 823 BLAKE2B 2dddfe1c7e55ec4ab70a7c556061a3b6b385a43a95e45a444038b06ca23e70c620f3b268928ebc3fe710fdf385b34f5484ca1bfd69b28771a857bbe3988c94bf SHA512 bc08692c0eb0baf560038537abad44fcab12b59c6199c383cca6d6a7331f5ed2dda9b2155cc1ec8b89041d186779684c14cd61854d99748c23b04db895cad03c
 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 bde33cebf586..56b9b6aa6744 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
index d630e5eb99b2..68d956726bb0 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 9be1f6798649..ca8822fb69b0 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -12,11 +12,13 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
+DIST autoconf-2.70-patches-01.tar.xz 27284 BLAKE2B fa4ef923d487f600de98d765d3db23c73cd546f777c19986f9179cbe0e9eb254e3bb4c8107b6ce9f2c1f008b4c72033565711f0d8b63e6538b83ec56a2d75875 SHA512 648604ec24decbc48d281049eca94e7e7146d013c006297d9d9c71b749bd856684b8ab8550ac8961ce506b036ad25b7236dfb5e53114c10edfefbd58ecc55020
 DIST autoconf-2.70.tar.xz 1346528 BLAKE2B 7a14f966f1fb89a250aedb03d483ab1f92d73a7085bc289094b62984620563922d041e717274270af0afaf52f058b4c6402c1af14cce58d70d5d884414797c80 SHA512 af4af6b8811baa424c00990b368a6cbfb1d598dde9ee08dce2a5fc32cb9517e6e683a59d6852507f6a72d499fc298c4171b6f06962cf3ba40cf1557cfb6069fe
-EBUILD autoconf-2.13-r1.ebuild 1530 BLAKE2B f4daa60dc1598eae9e05788f1f869db80c9e548f2ad391ce5469b6911484192f63cfb3d5d22c7c4bce46355c674b43c94c3c45b8aff78717d9971736ed37e91d SHA512 d77d846fdb6c22a20f447b6bc9efbaa33b3e69ed8c7a41f33b1cffd171af6594d6f06db05e643ee847012eb6e60b68e0aaa125f46695aedbf46806d21feca8da
+EBUILD autoconf-2.13-r1.ebuild 1519 BLAKE2B 58fd708a0ad5b5fecb1c27035f6283a02d4b49fac552a6c59da077a52d79beed9d28fb8fd8594d7cb6b652e0270ae7068060d97b5d6c4d6c228f7acfdf7f5e36 SHA512 ce5bd09f8a242fe91e3d5633f88ed33569a82264b881ea74a68d29b6175cf2d532377a1c80f1e7b220c0582ff4241fc7946897bbe32ad9a521a470fdfdec616e
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
-EBUILD autoconf-2.69-r4.ebuild 1311 BLAKE2B a9f50189aace861513fe04aebb63b8f6e1e478e4632f9ae5d7681b6c9073291ed9e94794886098c785c831113e8b765a13e6ba23f149fbda7ca2adc77c0b3493 SHA512 fe2b5a4cfbf4a2fb65b7fbfe4cabf6500e404d9ea681f6920e840a4f3dc8cda915e07cb295969a07d938ef0ac1d690bbf5043ebdd409d7ce9d5f7c818540b5dc
-EBUILD autoconf-2.69-r5.ebuild 1830 BLAKE2B 0f0cfbf6ace5140536b6a3c3016e0f7c8336fad564d93177ee8e3ddb44156f8464373bafe6f4ab2109362cbfb21d56c5ae9f2bf85b898765a163b11f79b1f5c5 SHA512 9ddbf0f2acd89320049cfdea14e426204281a35c0fb559394dfc593d6e6e3de332a4c5d3832cfc58da54263a201a83cbdc9776b94727190c166965eb42bd62e0
-EBUILD autoconf-2.70-r1.ebuild 1857 BLAKE2B 47d5dfec7bf0edb08660f1a63b169559d9c238c62ddd00ef46e77b9efde99c4492dbc618005fc4a61a2a6b5f9e619d49c9c4840fd0d347dff3395bd4725decff SHA512 c377d440cb1b9d59e9b5d4f3ea720146f196a639bce726e811343971feebc3ee848bd715cb92c6e42549a620af4ba981bede08e1e4c35665409498a9d429c435
+EBUILD autoconf-2.69-r4.ebuild 1300 BLAKE2B a7611ebc260e49b8893af7d1179820abad58dd294e8d160f13a8a3eba1fa7f91235851ee8a5116a4d8d91a045409235c4310bd012affbaa2084515618e32f923 SHA512 2b8b1f5c7db44cef4bbcb674909f6008c201e00ce1ffd7e3dc8d347185a4b7171e06db7a2f5e0c3b3486625aec95be374830fba486bc0942cf014126e2f4ce9a
+EBUILD autoconf-2.69-r5.ebuild 1819 BLAKE2B 5cdb2367829da34d55780dc42b5773a10b92610a33268a1dbab205c4296e754f11daebfcd635a99b2dd39b0c466371b5020464faa94793805bdfea37d0a86bcf SHA512 b591922b1f2e8aede0ca2f4bc5a27d86dbe7d43c3121109ac9b1a499c9d01da8888aeb02cb9d252d5931c886e53a54b61878f8ab6c66f4e8063a0cbd5bdd2313
+EBUILD autoconf-2.70-r1.ebuild 1846 BLAKE2B 86c980472a4f9dd4fa3c7a1b64a3da44e43b7358d7ea46863a2134222841eb052c3ba1246e75acb8e6edd0efa1f05d58518bf6bb64ec234bfcbb2ba20dbcc72d SHA512 3a6339ba3f3859641bcb16e3ddbca5af1f0a7276a661926dc44a79df284fb4245a90c64c1b442fcfc4edb820dd61a7a20e72d76b1c10d3a5540506d7e3ab70b2
+EBUILD autoconf-2.70-r2.ebuild 2040 BLAKE2B 9a149ce87967e1e58abb170f2f2febf01788988827e46067e898892b18c3686a999625073c68b618e3c517007600e1340e12c17fdae5797b0832c8bcac5b9b79 SHA512 dd266d75b0942f82737930263aec6f6838f0041ce5c99782451e1bae95442027bab56fed4a4ea2180aa25bc5e719926288159901adde0fd3456188e6e7d642bc
 EBUILD autoconf-9999.ebuild 1386 BLAKE2B de6bb3a1c210e63b358e6db1fa72c77bd5067fe22e629ea76620d8c31657b8c29bd58cdb69b39f87c7445bcc0d0da77e93c5d35d33783cc31df9a4ddf14cad03 SHA512 5dc7271984bb48e29325dae31d193bdf838cef778d7d391145787c4b1e1a31a4720f8827bcef2acf8d4edbd8885ebf70392d3dfddb7a64e63d30dc7208565164
 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 9a3e4927330d..fddff76d6a75 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index e2f9e6cee1a2..88dc5a32355f 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 3000e01e360d..856f5d6b85fb 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.70-r1.ebuild b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
index ce4adc5321b0..5ed982219210 100644
--- a/sys-devel/autoconf/autoconf-2.70-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
 	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-devel/autoconf/autoconf-2.70-r2.ebuild b/sys-devel/autoconf/autoconf-2.70-r2.ebuild
new file mode 100644
index 000000000000..169fd49165ff
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.70-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	# For _beta handling replace with real version number
+	MY_PV="${PV}"
+	MY_P="${PN}-${MY_PV}"
+	PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+	[[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+BDEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6"
+RDEPEND="${BDEPEND}
+	>=sys-devel/autoconf-wrapper-14
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5"
+[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	local pdir
+	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+		if [[ -d "${pdir}" ]] ; then
+			eapply ${pdir}
+		fi
+	done
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_install() {
+	default
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index f8d239c00a7b..0667e4a67302 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
-EBUILD automake-wrapper-11.ebuild 908 BLAKE2B aa5feb2c08ed035be419fd6e24cb078e5b3782233483602e9660c8a09a4d22502f49c2b7c890cbeebf6cafaf853cc54604261b2a2219aa4ea28a3a588f56a822 SHA512 3ae8adf0c2c757ad260f010b79cbe172671ccf94dd29b158bfe340dc145f121295aa2480f0ec35f436f76852d566a13a4e3e41f2c1b16d2f1c08e4ea782f4d77
+EBUILD automake-wrapper-11.ebuild 897 BLAKE2B 6349d4dd9858f9a195aaa52bd2ebb74e1d709d891f8054b94342142a7d3aa701f947135e05397c4102588c77ef1f4ba7fdabe8887a061f87641225c1f3060cf8 SHA512 3d3cd5d6bd8ca09abb5ceb878b8d63b80c3b500bb17eab79b4bbf5557f64a659db54a0a190691622d5c1f8ba8ba3a207103b4af5773961f21d8a708c5eb0c372
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 5691852dfd3f..ce6e5d6dead1 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 8a7069594505..c6ab05e38a2b 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -60,18 +60,18 @@ DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0b
 EBUILD automake-1.10.3-r3.ebuild 2388 BLAKE2B 9dac25084c353bc3316360dc606c8cd4645c4fc0a68b7630a197c30b0669ac845815eb4fcdfd63549788ad2ebd797315c059ffa38c385bd5c2ec16ef4a57ef34 SHA512 b8c8b9fef56b930ad471a52b547cfe955b37bf34fd9efec2e73c6abab0c9361fe39a5801a76af8e7bc71cb274485fbf231f18abcfcbdd23f0a558de9eb87c30a
 EBUILD automake-1.11.6-r3.ebuild 2565 BLAKE2B 67a70c6bc25cc386e45d742d9552197ed1e4b1d9d2ef85f5b22d0eeceb20e018c0b482dd991a7640fbbc424d1f6e3e71c442aa32ca28b8c1fc2bc4f29b55398d SHA512 dfb8aa86a245b1fc8e28dab0b5007d9b64f78ef188ecfb469df60f8583dcf7da62fbc8c18c2a5a790fe65bef344a5e8290f4170cf6dbc34121a9bc152e836a06
 EBUILD automake-1.12.6-r2.ebuild 2420 BLAKE2B 0f8f42975c78c92fb942c3c446608854fd9058f8d811d46330054b070d3dc5585ba872060484a93713ed216b2e4984dd290e12683408bc572ed8033a38695ccb SHA512 6a197c024acc592a697efe31ce28ccef3707c6896a241f0bbcc07f985ab0ccb62a868fc844ac5cab381eaea68a30a9cd02b466cfa18382fadc979031cb22884c
-EBUILD automake-1.13.4-r2.ebuild 2653 BLAKE2B 5bcd5a91d7337f8709533c6bddb975d7fc09c53d72e729db9cd8fb03827b4fd770ba9cded9692dab9a9aa2faaf8a42c50fd3e3e60d2d2c5f9fb6c2aede9cbf10 SHA512 5f2029f7ef514a948b2f495f522b0e4f89247fe6d0007a2adb7a118663046036e5e6d1b979002aae1d3c160381aebead0e671dc8d4eeab32ae6f858d384c1010
-EBUILD automake-1.14.1-r2.ebuild 3032 BLAKE2B 0a013dd34b65747ee69e637109b1ede13de730c5e65bc7abb978c7db113cb28e651f864db7a4d21c1f0cde992b2f42c59a8e6b2c93ff00d96b4eafff0858ab2a SHA512 a11bdff3bb2a245c32be4dcef028b01f2dfbd131d895e628678adbb08d77b1c56080dab13d7838430aa44c511287f9b57473f94fba5db11a0780c70adb7cc660
-EBUILD automake-1.15.1-r2.ebuild 3202 BLAKE2B 3781bf937cbf81df93118aca3246362d2a8f18de91514c8459c1eba8894590b308663a7f9c219f8db6e03e0ddc254bb0e6e0b91fdc72b52fcc69c136b4748b6d SHA512 175a7cb67a31f8e19a0d6968a36a8b1c72eec4bc1538d4e95b95392df0c7da8b9338f36f515b84e2773cd9bdba0d638b79cc290e4c380c7f34a120201681f138
-EBUILD automake-1.16.1-r1.ebuild 2920 BLAKE2B 0def0e2a678d7768ac3823050834f2adedda78be981038aa82e5f6ea64b54c6874de995d0f2c805a2f276458e57824d0ca18cc6047c8433f88ab91c0a398c7a8 SHA512 6276e1b62d120692f7e15a7afe03f0c1f809d467196378c691aa5a8cc8a5a5420528641053b7c55786792955cbe13e08f2d64e88d423f5c520501c6a3f88412f
-EBUILD automake-1.16.1-r2.ebuild 3610 BLAKE2B 91b42ec257726991a35412ef3388295716fcba7ab137dc47e4c2ec5db73454bf1be406a0a003b5d7e9e7e7e4fb58cb7025d0b40438047fe53c9c0fc948f7093c SHA512 03641d2b261b437afc10a6f2111db869bf48597ec89cc9a76393990f68d683d5bc469fa3760dbeb503f0cbe830afec40fe08b55de2baf9949f2ad4dcabb656bd
-EBUILD automake-1.16.2-r1.ebuild 3549 BLAKE2B 76dbefc6838607be98a0cb7546d9930485b4b9de9452403012b9b31b45f3cdc790a0f78c675465a588f4c895c78161e7d3e26df56147a519c66a63c9f38b761b SHA512 f426c5947ca570fee49ad90b88eccc505b32f0dea78db971bab25efe9184f7248396fac9818ae6350ed823a515da1d628b00d2f98f62931dcfd9d5300b09eed3
-EBUILD automake-1.16.3-r1.ebuild 3485 BLAKE2B 9c80d698b7c9f6c9fd696c724b66a47e27217c4f6f508b2213bc1e0f7addea156f4a7a48627e7da511af171e65dcd416ea1893ace9e6342a0404225f78f19e32 SHA512 276d9e2211aeaf74a572b85da8c1876198a306869439ed98b1e482ab5a954e02823b26c606d67707b6a815bee9ce9a0ec3279784e6ae6866e7690fa0381be4e1
+EBUILD automake-1.13.4-r2.ebuild 2642 BLAKE2B f986fc77516d8aeafc93a897769c3e0a72a6b88e6f7b871dd8aaf647393888087157d040ffe76c6b9436f824ae23a9a05e602506f4e8aa531722510d2e47d08a SHA512 2225b6dce8dda4e27ffdd386afd7c599f11aeaa345f6b44b67a8fc25f53cbeccb00564679df20b4543262475e391a8f41a88645179a7245242e928324c0cd1db
+EBUILD automake-1.14.1-r2.ebuild 3021 BLAKE2B 6a02c815643edde1d0aec03aea5e1b7005585c0a0bee7734b434c09a27efcb231ae72c885d8c38d023e8a00975cde796d95c4520e5333ffc63b43558384349b1 SHA512 3fad414923f4808aca91d51704b128ba2fffda5482b3a579dfeaa90cb2795fe238d3e1a4168732581481eb09074e01ba3e9ec7a79fae16c2ca901e3ac2bf386f
+EBUILD automake-1.15.1-r2.ebuild 3191 BLAKE2B eb8fec381047cc9de2c56d40f7c80d9bedb06649de82b5231a926ae3361c7d2537ec16e6f79fcc8194de4943c2f445a2cc23afe36c3780608ee82f249c9750ba SHA512 905cf0ec6ee9f411d4bf8ca262c8002e04b346c4b2a241005d9eecfb0b38e3050add4d5cb678ab7d332bd39e46881cfd5f695c998dc465346b2d13380b6d3566
+EBUILD automake-1.16.1-r1.ebuild 2909 BLAKE2B f4b9697d3523305d82bfb49b2d6127c1747b6888e3d40e7b8c56e5b1d578dbe717a7efbfa8233a44341fef69302a97b0e175d3f7bfe74cc50e8b49fe5e82a6c7 SHA512 170cc166b4b916dd2fccc8c79fcf02b7089bedfae9ef9eeee6b2b5d31a12518237bb69ffa118b0816531f74b91e2e1ffda68b25db191517e41f9eb8e376dd17d
+EBUILD automake-1.16.1-r2.ebuild 3599 BLAKE2B 6285f60341e38267cf0e95149c9be2b8d7f09b076b65b8a8a99edb17245e2dab59358f291857494eb8904cfec946a8f0de884a29452e152c525cc97cd856d830 SHA512 f5b8cb4fb6e6b45206858b4a957cce7f6e4ac28e000a491152ba1f17e90e5fac4ce142da55cc73272d6e9e9315641f8bdce6c090e65d9e98b84b897b235a5449
+EBUILD automake-1.16.2-r1.ebuild 3537 BLAKE2B 8d3e14fa06291bb5de7216d00620a94dbec7981d01fa3a3fb726ed2d7fab41c53a94d7d85b2d6df34b296da74d59e326a5dc7999389fc23731e7664129125e9d SHA512 bad0df18cfe350ef0e90b797b847d52ac7f97a37fadfe3f11a5793c2dba61f349ceb878a6ed424fec8389025b56c9a3fff332de74d7ec9d7f1b131131479f8e6
+EBUILD automake-1.16.3-r1.ebuild 3474 BLAKE2B e8913e0a640a1bb8b41a926ea0fa7b790c054356f6b3d3c29fc6dfbc350ea030c3cb6fc4b605a4f9a8238847936da19c2c7c3ba1464f66bc91b2860712c8a041 SHA512 24ec3e2cfa2f35243aae8a55c9c485748610691f003df2dee0a2f1140696f4a58f8612e2f3bb12a7d94574af9ccd7574bb240e954b82e8a724e0a4879ca5383a
 EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B f631fc0d87edf6cef1a8a07f0417fd72df8229fdaeca66f2f85944cb00fa3f6dfba73cd20df88ab2fe6fbe268473d8dffd6ac203980d4e241988ad3084ce9271 SHA512 ff05eabeb5baf5d8415b3e8c87e462e1c3f5b3a46a4910f9c0216746e6794739947c98515251b722dfbce51cb12868f4dcc247deac924371bf504a7b35fb4c96
 EBUILD automake-1.5-r2.ebuild 2243 BLAKE2B c530c3ff67f450a3c5c10ccf224a2e87021e17821ce15b288dc979d8af78f81d578767d86fec09b15b704d32c7c46504e3ec35b126cf6792145c6056b57ba048 SHA512 7ca78eba7b26acb2ed84e8382148a895581345d359bf63c8aeee5efca99fd9637247b573c420a42f6a5f6bcfe2093057470f6ee259dea06e0a99b7ab0e1ae927
 EBUILD automake-1.6.3-r2.ebuild 2045 BLAKE2B 6c06598b71fbaa8976d5d8b1fdbe5c091698a38c881b3a5f978eebc96207b3dde2d63022b0e2f6b9ebfb9fa0e22e7ab6a67734f52cd52be083ceda959af6a4bc SHA512 b583d6abf8fb8f0f15f03d5faab000244322c309b089f40b59d0b0a3202c58427cc5de9b1aa423c1cacd20277c51387755e2c367e80a85d0bab923a5b6bd85be
 EBUILD automake-1.7.9-r3.ebuild 2179 BLAKE2B e9da60d988c7bc2a46f34271b0cb1aecd8a29f04b690d73d7cf7af821fa574ee51e899952688a055bbb6031760b1908d761465ed6ac6eeac851e76545930ab2c SHA512 6667759ace8e089d5d76553897fda8a1043926a2888578a61ed0b29892857f2c3f98df2d480249c74c7d66ab6e5d313cfc71ed7bb1d90269dbccd53b8f1f02ed
 EBUILD automake-1.8.5-r5.ebuild 2206 BLAKE2B 397fa1a1a136989e2edc100edf150ee08eacb02784aa4ed0592b9a859ed1a18ba044dd56ec71ce5ccc79771159f5a9e95070c8e4817815c37a7b10ea78a2975f SHA512 542538416e7f07413edb7f9152cf4dd5777097535b1b065d486fbbf686ca8fe2239d8c1ce7170a1b328f0986948fa483cb5b4919e75818aae4399df72ba8eb05
 EBUILD automake-1.9.6-r5.ebuild 2420 BLAKE2B 5c8f761c4a20873b880aa83d5729a892dffb4a1018570f958383b0ddfe18af3a6a2559b25118f5942a9b0690c85335205908e6bd26d234a01083a16cfe664a5d SHA512 dc8e5ad6a642196e821d2ac44a71ceaae7ae487eabc717f97f79c53683b1fa7431e5ad4b7975d3c6a963fcf1afd13040e47352b59596d4d0e2a492befe7aae5c
-EBUILD automake-9999.ebuild 3392 BLAKE2B 01a4f1365c3f58b55d33ee08e6bf0d34d8f0e2205ae8d072aea23db0aacb36e5b644dbe423e3f5a14141bb12d00ff0cd26f16170236f3d97ae7a1d31bc4426fc SHA512 e3595276a3433ad2887d0f97bcfe46a279805e35abafaa8ede667e539fb1a52591978071ec92218b8fc3b69aae419e59fd26fe94c7ae29f5cbe330d720b45a4e
+EBUILD automake-9999.ebuild 3381 BLAKE2B e93ed08dbbdff6474381884f38221f40568db5b5101432699cab270956df69088a02d497decf71475f0aa1a59a1736bd3fdf78e74db31a3d4d06b2b7af778172 SHA512 9729cafe1df337c491aa64876dc182d33f17e9ee9d4de06b593128c01485bfc2c4f46f966c08bef0dd7817cb759a89e87bcbad4cd8cb8f37df2367c076f81932
 MISC metadata.xml 331 BLAKE2B 71cfd842ad316730cf02f9f80b8c6ede120bfe4b007c43737d31204990c97665d916b69932d9d855cfb4a8b325e3920957c5b287b896b9d371311ebb57134b10 SHA512 2194f195d6364115d869d3417993fb58361392dc7f8c98792213a22ad3289abf35199403c6a326d6e8f3f234afde056ff6f4d67a84ddd1cb4a227dbe3e9982d6
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 74606b6f9b4d..3eac0d586c94 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 57832b559709..45228bc94880 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index a0f8ee157fc5..63846a747b26 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 c431e1c5063f..cd16023c5dca 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 4f08be21237a..563dd100f04b 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild b/sys-devel/automake/automake-1.16.2-r1.ebuild
index 8d0e9c8b3213..946468a86a1c 100644
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.3-r1.ebuild b/sys-devel/automake/automake-1.16.3-r1.ebuild
index 7d33235a2938..911f740f96fc 100644
--- a/sys-devel/automake/automake-1.16.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index e51d9d8f778e..d357215cbb5e 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	else
 		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 42466686c550..34c233ce1680 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -4,6 +4,6 @@ AUX bc-1.07.1-no-ed-its-sed.patch 441 BLAKE2B 52a6b47ea4d4847ca53e731a1ddc5ba4d5
 AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
-EBUILD bc-1.06.95-r2.ebuild 1568 BLAKE2B a26c81ff32f9044f0672535852ae97c888f5612b6aab28e5ae78067240a46cff9e99a1d4f91215d56ce2a50b3a65d000f11f752a9cc338d3a47a0d063616ce65 SHA512 1a65cc50f7705a409a809b121c6c07c51c51facdbaee60bdd1b3ea81bf839a38413c5bb710a94c59d05001faa95eb0e4da84e945aa681b8c86f2dc3750a484b5
-EBUILD bc-1.07.1-r3.ebuild 1430 BLAKE2B 8a077f558dbb24ca83c478b8c9858bc6e4ae5e97e6007303cc08ef68d736b840747a1129bcad8552fb07c5165c142587240c5cddeec36045fbd5f046266e3ecb SHA512 751f179bfd8459766d56b8f773a9748f2ee0650b8290c642ba8c094b365a11788671a0842879dd96f0bfd63d5a00c2f1ce8972782ee5c1bfcffba8ee5f2ac3fc
+EBUILD bc-1.06.95-r2.ebuild 1557 BLAKE2B 2530171d4854f3e9540a464164112c5a0dff9af2ab540b82bcda3065f7551758b8b03e373add1e50ca3196c5f84f51c2f593b9e0f3937ed1bb78b81ec080801f SHA512 06eca6f6e6b47a3a92e5bc6122108a0e7ac3fbe7e8e9a6730e94ddd99179a15d673ab65bc646c5591be8d6286047bb96edc08282b198ebcb8a49f9312c11b562
+EBUILD bc-1.07.1-r3.ebuild 1419 BLAKE2B b0421ec35881094567126b5ef4943bf83aad28b9bc090570a56062ada325c2fc5b15b67f70da67be3c2c3abb4ef7bb0e5123ec7a59359d8ad192c5e8046eb34d SHA512 778ee5f1e862b2bb03c36dde71ff478210fdaa24fd65e81fe7ac4b015174ce683848470486b9f20071ba89517f16cbfe13f406f1b7438e15b2182ae2c10105d1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 6bd1091b8a16..a956b9652a6b 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r3.ebuild b/sys-devel/bc/bc-1.07.1-r3.ebuild
index 8edcdd7127b8..c0b99b248143 100644
--- a/sys-devel/bc/bc-1.07.1-r3.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 7dc17060d7be..6582c8b8c0ed 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -16,9 +16,9 @@ DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a79
 DIST ld64-530.tar.gz 744871 BLAKE2B 8117160ffe55c02b463559a52fcbd109629d6e2b4707f36391ec2151785cc1ab5be911129397af7bea05f06b2c718bc345a1e3b6b0838dae943f4083612af38f SHA512 0197ec05f9fbaf9e1902bb6e0819d0562573a433e0445809f1020e76126d3af57222a8e9e187fce793a5b581f825b48bfb5ec5cca9ae3eb77758cbc7f20e9e20
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
-EBUILD binutils-apple-11.3.1-r1.ebuild 12072 BLAKE2B 503efec8e7918f50ef1dbdc12c8c6e0e9eea9e4742e936b64f53bd62a1c9b6c088fffcf9a2e8f5efc0c35a1038cde09682b490121cd07dc7a75fabae5e93d4f9 SHA512 18ddce3981b0b7bc7f9fd15fa402d5cec01f851003f892e6b57499654b5cb681c7d1362b49f76358fca1443cc9b9082f4ee491c814b70da019bae25667b9007b
-EBUILD binutils-apple-3.2.6.ebuild 6937 BLAKE2B 649bdbc5433d05db4fca58b4cb95538fae8654ac0c91c95915f172a92a4fa61724e57876b0a9ecfb09d1942060b0298da3af5577033bb8a860807d6a7fcdba08 SHA512 617d78b58688d9f4900d65bd49f90c21c64d62de48bcc42e63ed9a5f2468e29e5dba84e17799eb2fbffa064ce5b0087fbdf5669000b0dc6a2eb30388d585f123
-EBUILD binutils-apple-8.2.1-r1.ebuild 11367 BLAKE2B 572af74e5a95f6c120152fc7627ac1a2634a8537ed28400c827d683cbc7447bbdd83d873678ab2e459770a1c515d43c759b0471fb3ee531d5a5c203dcccbd774 SHA512 9a49baeda4f83da08eebcaa8497e1149b490b3bb7a49d32106a3f4ab1b770d7ed0e499c8ae670ebb83f671bc20d97a8e61e924a736e408e469a4146b58418e80
-EBUILD binutils-apple-8.2.1-r100.ebuild 2543 BLAKE2B 2db8d00218bb9047adada4d64a9ff04ff877c58095198fdedd4032be79daae71ac6d08867f28737c62ad49ef8f455ba1240340942754f6ae5532ecf0dac78d9e SHA512 695fb60963860ada3848850ab55f649792948708e3eb410877f8c930d7df21ea5f5cab4bebc0d25226dadb27de975878c562879d6e6d1483fa526d86331d57cb
-EBUILD binutils-apple-8.2.1-r101.ebuild 3345 BLAKE2B eb961cb7cb655b097d2e5911bcaf40ab7409de8ca0f6c44940135a7f9d93b53a234dccf6ae2c5918df235c02b4b7018f691c49827b7673eacb917588aa4f0cc3 SHA512 2c7a806885b3f6d93f63c006f84cc51cb08c609fc1a5b32991fe37ec71e7e83047ec70956de2a3b33de7bbd106866734272d391c21be2a13dab132cff4f4c628
+EBUILD binutils-apple-11.3.1-r1.ebuild 12061 BLAKE2B 8ab50ea0ebec56f3fa9aa6ef3a2b550b870119054d0533a283faaf8acc34bdf50cf36538ce73e99ec799688f084a671ebeb893548f97061c9f5a08151535d705 SHA512 e55d96d015321a987b3825a0cc500c4a639dd9d540e4e7158c9767ee1e8428c4bf49dc62c752e787de4a04b53d7cccce0a1242a3e4bc46b15b6fe3ade2499bc1
+EBUILD binutils-apple-3.2.6.ebuild 6926 BLAKE2B f21d41b62afb49a2aca002388c503797d61b3b92387098c8879982ef7eec9f77834ecdd99ff6e30c0fb9b2faad04edc67d484f5943d712f59578324e98334ed5 SHA512 048e828128b4436cdfe1df71ed01c686b5837327696533b455e38c28eab73cb395a1c40810e6d9c58e3224f6787275cbb32e569d13aa616be33833fda8124a9e
+EBUILD binutils-apple-8.2.1-r1.ebuild 11356 BLAKE2B b643a55991068539cc7f2f90095418efcb24a15fd07697044582c8726e08eb123daa867b689d23ed4be4c96a28ad09b6b362628c8a3d9b1012ba4705c874dd26 SHA512 1dabd8e789c0b6537c66680ce1b7df278aeae7d92164395f9b02706f842ac584e418c0ffa89dd24bf4809dc976a9be1fb51e18b9a9c8799145efedeb115d5153
+EBUILD binutils-apple-8.2.1-r100.ebuild 2537 BLAKE2B 8a9e04314b1142cc7ae234fc97a6a52a5a3b5afdecbf9438508ed6d46007491d67fb386152083e25ac24803618d86cdac4d55503b8ed3384a8a2b859d16fae8e SHA512 0dcb06454ff8e608e2009f66786fef30d31dfedaccf386071b208082566660f617c7f6ada73df627d5930979a8e50d7747177d39f03f8b99605d50c77537f977
+EBUILD binutils-apple-8.2.1-r101.ebuild 3339 BLAKE2B d96d586837d22920ef55bdd1a3041da0d93f3333ecc6ddcf2e7d5f64ecd7059d6e4c4498a4dfa7ed32597e7fd03f3eeea28d282cb33f916c2bfa5e56fe46c7a0 SHA512 d8823924681aa645f8976dec196cb1b5bb0a5336ae9edffc1807b7af9ba0efaa5618316f6ab27e9a4f922d926bdac317dd040bebc8ed2e48b961b74f29af5e04
 MISC metadata.xml 501 BLAKE2B 98bd13a9501faa366c3a7dd9eacea30192cd55429102d920df8722e2565eac472f2d814f09c5be5c437b86a5d404af797d521f0fc1fb4dba374e23af31fccf6a SHA512 026c997212e2bec4698613ad9f5517c5a4427d6da1cd8a8afe3d2f549edbe80f3a17d0c345961a9dbbdc730e8b6b33fdee97f66b3309095803ced0fb9202b899
diff --git a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
index fa4886114d0b..42f2f2808cb7 100644
--- a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,7 +33,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3-r1.tar.bz2"
 
 LICENSE="APSL-2"
-KEYWORDS="~x64-macos ~x86-macos"
+KEYWORDS="~x64-macos"
 IUSE="lto classic test" # tapi is now required
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
index fe828d3b1644..49c5ce262a52 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ SRC_URI="https://opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-3.2.6-r0.tar.bz2"
 
 LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND="sys-devel/binutils-config"
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index f7a37367f25f..3d5c7e8105dc 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2"
 
 LICENSE="APSL-2"
-KEYWORDS="~x64-macos ~x86-macos"
+KEYWORDS="~x64-macos"
 IUSE="lto tapi classic test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
index 247ce794be10..97ee1d43e54e 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -
 
 LICENSE="APSL-2"
 SLOT="8"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE="tapi"
 
 DEPEND="sys-devel/binutils-config
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
index 3e02d9be4c80..dc08967e9583 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -
 
 LICENSE="APSL-2"
 SLOT="8"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE="tapi"
 
 # xtools uses c++11 features, not available in gcc-apple, hence gcc/clang dep
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 301de5f45d54..9cb81f76376b 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -9,7 +9,7 @@ DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e9415
 DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
 EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
 EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
-EBUILD binutils-hppa64-2.34-r2.ebuild 12313 BLAKE2B 13d2653eea8d231d31cb13a0ccd03ae5e372ee4a9e6518750ed12d99761098e6c9e64c091f8fa19eac25933fe810625cf8629a0fb83c3323a56e225a8ec64d1a SHA512 c8128d7acf62c06336df0d70f7455f802d5135317f62f45f50b0585038f85708291d78d2b95836377ad9e8a5200a569dde6e738c1528be7475fc28480e23ebee
-EBUILD binutils-hppa64-2.35.1-r1.ebuild 12070 BLAKE2B 28033f46a7a4233a1fc822436fc072eeb428a2cfcccc8b8fbf949bfa16f139d5086031e17a07feb768944169e11aaefc9bc882890d3693953f068551d69051d3 SHA512 3ebbde6b70d31e7685bd3914082b895314195fd428c4225b1cf4030eea22d21fa22c001b3251034e339a90e9d526a51c73604e9711056ff72c605fb2568fb4c4
-EBUILD binutils-hppa64-2.35.1.ebuild 12070 BLAKE2B e91f9e33cc2f2c13734659859663bccefeab65cb513c2458b65add662fc00c7a633f765031a6c6e122451cb366edb69d8498b7a6022e9499e10976547cec8013 SHA512 eba147c86196fc04a4cf27ee85c1c4faac430552ee47de942253f80699fc87f5fcee89864570c0552429e8052ddde438832c4e985069e148f6744f490f0cf6d1
+EBUILD binutils-hppa64-2.34-r2.ebuild 12447 BLAKE2B 84e65ce3f3dabab20ac002cbbe67b0545e1f15adfc262c5319d579320c1fcc30eefbac6618d320802c2160d351ade699f0cf8964209268f44ca1e97512719d50 SHA512 8f4e0cc1d2771c9d2323e623bc4667ab5199929631877802fbd69b48ede3f7055df305e237a021c8f0e38801eabebcc15c411e6d85e013a4a3115e5976810665
+EBUILD binutils-hppa64-2.35.1-r1.ebuild 12204 BLAKE2B 107fbac936c6d7ef91e6f9aa0f24c3f91192c48620ba1c8507a7e2a143b533c532ee9e025233a1b8c0aa468252a06332f83825ab9ca9c519f2c1b48efdce98fc SHA512 aa0053f7d21dbef7376ce6cb9503d2580ed804f9bb641e8b2eeae69f8636b578815a6ceccf69e3369867e149ce7783df7aa9922c204988936c1153229cdc1b33
+EBUILD binutils-hppa64-2.35.1.ebuild 12204 BLAKE2B 534a11a53242fcfba7803eae4b9585db43346b30d9f18a1c88ccbc17fa84053a5bc4397c8d1202604295eeadfc1c9a5775c0f068ca24c87f9cae1c80d787caf3 SHA512 289476a85fdad16df68c9f1dcdf2225020e81139add596040ca8870e0c5b6a30191dcea347f2fb55d4a8759779ed6c6edfa9ac5769bf54e671f450eb7c7f7ed1
 MISC metadata.xml 691 BLAKE2B ce21a0c95e69ad1f656373ec843f43ff5300b0145e0d89b92c7d7ae664886db9ba5afd4c39c7d7fe0d4f898b43d98bab6ba562b06945e5016a2abf62e1c4119f SHA512 97ff085ad4b3273a5867d37bb70dc9586a7bc3ffbf9ca1b6c68e224c340afe102afbfc034b339533732afd032a7f8be584e31c8572cd76df90f4db93bac3baa3
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
index d7d459bca525..9eace9459ce4 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -258,6 +258,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild
index 7fc606f9e346..e007720179e4 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -249,6 +249,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
index baeec28e3432..27d0f88efc67 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -249,6 +249,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index b645efc1274d..edcde9b0e7e7 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -15,8 +15,8 @@ DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc4
 EBUILD binutils-2.32-r1.ebuild 12354 BLAKE2B 1771cb776e87efa9b0ad69a78df051db44b2078e323645ce185815987a540ffd4e82ed2ae5b3d92ffa3837f117ec7737188b9920f59b8b5e0f55cda03afbf888 SHA512 4233627432a43ab46dac5e10d90a07dc9e085455f3140fb0a731fdb1ef2bfd2245dae3c47e9ba32bdb7a8650f32e7a9f49b911999ee32a18d41c32be4c697fcd
 EBUILD binutils-2.32-r2.ebuild 12173 BLAKE2B fb2dd9286d25b3e9b6bfbebfd70965e72b0458b3d87830be8f8e2f14866818441118f809392c34f2ea535d2f54821c3460108ed71bbd9e78286cad1190a669c3 SHA512 cb442d2e13a2c33fd3e89cd948b5bfbb453d7f37ba18cd061c21c69fceb8cdcfb047d4b009d1ec5d6f3d90c37ad9fa30cdfaf2422ccc6c410720ee0989c11cae
 EBUILD binutils-2.33.1-r1.ebuild 11908 BLAKE2B 7d4a576a037a162d329977822aa08807115e7d6775df73a047bc1c82bdf1cfb3a7f51e31c21c2682553673dca8bbb5db0359a65f3f9722fe751b7871b2bcf91a SHA512 2837ab896d900e9dbb19e7d5584bede1fa19e50ba0dc432d02644ee4c8c791a1219b6fb35213b5e8f50d2d11d24ac1cb393cfd2db20346e7eafc23a8a0da82a7
-EBUILD binutils-2.34-r2.ebuild 11870 BLAKE2B a7501d3cb895043c2b8c6e6d87099b6dc6dd52a8eb9b44bb83a2056231eff864171ca9c7031826341744d252b8e5c75af5490f4aa40c1dcbd543bb49e90c038b SHA512 59a910b2ee6a134095739be9c8429b2128ac74b4e82e57517af8c08bfa1295edee143717f2a1a6f8ba0f3bc114eb45f31d17f438d08c0d346c8f5b20fb7a16ed
-EBUILD binutils-2.35.1-r1.ebuild 12468 BLAKE2B 43658cefb152986e42607766f8b263b53b66cea2fd6cb5f6933ad616e4a8a612f2fad907a10fe3aa675b6ffc8810d03f3a70253eae0a00b78a2734ee85ea7165 SHA512 2feeeea71ad8f112284067407fcae8c02850608f6ec246971e4ac6a0ac496397475c2122be830c8578fd3464dd3654858de76985d111c45678121bf0379aa0a0
-EBUILD binutils-2.35.1.ebuild 12468 BLAKE2B 92daee225625599510aec7656338a8a91853c4541cfc75b0f72ed2814941ad3765f51bab88b694543e180b9e0f88799fcff680ea24140b511145ffd0d4f2ac5d SHA512 fa18f03f24cb6880ad1ef246fe382a33187d822b571c7183418a228721578f4cf9cd1807524c04594dd5ac342c8b7bfcbe0c82135d196e2ae025d40016b48f08
-EBUILD binutils-9999.ebuild 12469 BLAKE2B f99ef61b216d5e1948898a1f79aa35a7e8dc439240b6ce9cca8cd88e9a11497e2a937930c3ef31b3d844c180f2352cb33d98c189d4ec8aa46d24e38a80b089f9 SHA512 6cf1f15697a42b4931e1bcf1180ed658ef975df3053b16c41acdebf2c200075b11583aa4a2d20fb84ff6b8d3c1c3744c37317117ba6235b024df080059fe17c9
+EBUILD binutils-2.34-r2.ebuild 12004 BLAKE2B 7ac248b26ace7c134b4cc1cba28e53fb703209584bda66f9916c86f0406384697af77f4e3e10c78f63c3b3f002255232050dbf11fd2e86692125df3bd563b999 SHA512 cfa9314e1d4851e20bd42ca481a3c97a8c6978f2c38616f7f73585f432fbe50304a091a9b1ee4c5e20e550ccbfd06c728a6f63bb26981e01d9b09407bceb61a8
+EBUILD binutils-2.35.1-r1.ebuild 12602 BLAKE2B 01579b5d3a910cfd9c35892d7ab31696d98e650c1a8da0b6c07ef27d738396e1858d0109139798a69091350a3eb5360943cbc1d011419a609fe36d5789fd95cd SHA512 cc4001a6f5bd140366517f713d0431c3d3be997cf7145d3bd617c4ef25cff2f9b5d324995ff3e689eecb3e66bd4f72d763c6535a1f887c3952a206130e9f5e48
+EBUILD binutils-2.35.1.ebuild 12602 BLAKE2B 28e7b9f0801c04b74f747478e51f3627098ad7390a17ee52df0e7c17a71d2449c96a7808cdca90bd2d0a3c3f33996bf1b25b755906b60e673df02098982310b7 SHA512 e71e621c220f229cf988c128743fbfd937932b52948ac65f5bca97d98d1441240ce02757dbdef6ef83e09066947108078e6ba1b1137e42bccda8f795dd31556c
+EBUILD binutils-9999.ebuild 12603 BLAKE2B 785bb872ada3cd55ff301861375c0e1babb1f27f66e4872fbaee7fa5bf4d41e723260773a21e3819427b660f05a5e1221960b63a14a40401fd6f186e9346b125 SHA512 cf8c62c71f0b74f74a597fd0c294897c23f09cc791adef8199f68f9aef4b1af2348b5472dfabf57d5358f36449995a06e3ea6c37b1e69d572c34cb1e3ae6ec1c
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index b18c16bc3c90..21e6befdb77e 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -246,6 +246,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils/binutils-2.35.1-r1.ebuild b/sys-devel/binutils/binutils-2.35.1-r1.ebuild
index 57dc7a307c1c..c64b6d48e492 100644
--- a/sys-devel/binutils/binutils-2.35.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.35.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -258,6 +258,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils/binutils-2.35.1.ebuild b/sys-devel/binutils/binutils-2.35.1.ebuild
index 2f8b80c52eea..cb86407d9c85 100644
--- a/sys-devel/binutils/binutils-2.35.1.ebuild
+++ b/sys-devel/binutils/binutils-2.35.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -258,6 +258,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 25e45ab6c6ae..40f21fb06287 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -258,6 +258,10 @@ src_configure() {
 		# Change SONAME to avoid conflict across
 		# {native,cross}/binutils, binutils-libs. #666100
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
 	)
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index d900c9d76d5c..21024fafa4ba 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -3,7 +3,7 @@ DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fd
 DIST bison-3.7.3-patches-01.tar.xz 11336 BLAKE2B 2648dacd99c64c366946dad34f9e5fd838b43257df47bf74e3a3b63b03099152b4884d9b1c5943ee5c47afb090369278874c5f2b40dfa69b3abfa4eaa556843f SHA512 a53d541a550cc45f6c677fb6fa830640b64ba2c9a4ab4e6aef1f52ecd5fa38501e2391707d66c2958dd7a139dfba74ae5734e80d15360a3aa544fdea8ecf5500
 DIST bison-3.7.3.tar.xz 2613028 BLAKE2B a6f1063fb9441ae9102b29dc2786b7eb7104f7f13288d537080c26e7982e63f7a954abf1903f2a79a88578d88e9f3c30da8dcf12b7d6c89de0b60943186332c7 SHA512 34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed
 DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a81850d6b8c4ff63074df46fa7d6e1d9645797c14be32a87c0ffee6830b24e49137b6357d3284d736b407fe7d118 SHA512 3fc13ab21e28218afc9b7f1196a5607de7ff4403c4126df359848422a8057ac6c17ce4344864dd320b7c47a08d98e0f3e2929f25b06be3b1f1c867c0568f367c
-EBUILD bison-3.6.4.ebuild 2430 BLAKE2B 3568a2e86510370c1b6eaefa9a14f223a090d4ec27000e4df8fe0028f27857c6a15b81c17a6dac958ce0e4e259e0ec25c2a2e1087fdf3553d22705a3dcc9ef57 SHA512 dd85fd37a0f596b7df492596b5f301bac30ac1f2ecf7e3d8b72728b880579974ad7752f38a70c326e390cfa2fe21a9587934c82079852b19e1a63d07a7f19e17
-EBUILD bison-3.7.3.ebuild 2443 BLAKE2B d1875254eec96b127fda5e15bbae8460600ebf6e36504d4b80e6619bc8836de2b68af0bc40ebc909784dc7e38a1a34565a4f5a7f3639fcaaf80d2e13fe051f07 SHA512 3d1a408152951fa2fafacfcf8bb350e9592c0950ef5191595a69c229eb415749f38335a2f561b75bb9fda48833f92c1b832233ff3f067a37a7855f8e8cb8da47
-EBUILD bison-3.7.4.ebuild 2452 BLAKE2B 5946c6368b26f69041599f3be7e21ea0a0b934962c3593ac7a176f6ca61adb70677b342bf1a617b749fbd6a36d83d8a1a24135da9b197d8ab14601cc1903f4c1 SHA512 94f9e8d37414fe4a259eeaf644f8db22ab632f236d319e53236e130f4ee78dfe5ed551840ec2d2e6cd4efb231162d240262a20612756ccecee02f22c72279428
+EBUILD bison-3.6.4.ebuild 2419 BLAKE2B b5d405a8c927778aa0fc5336691351dbebc294da46493c56ecf95d238155dab060d41fc7687acd83360e1301004307bc3d515f34d967b31e26440e15a4cfdf39 SHA512 3b58aaa76132e6c0949beee503741604041c5a49b5aa16aebc7dfb496a1c6dd26a20715ccd9e67d61a4c192cbfb32a119e505ec0953fcf9b13cf44681710b1b5
+EBUILD bison-3.7.3.ebuild 2432 BLAKE2B b2dbf43ba21d82979c7e9ed257dae1997e6a3ba0803aaa5eaa8172fc9b025ff18cfe959cb8e2a503e53df1b01eac73d4503842efe9f41692ffd4e343bf978b27 SHA512 5187d11a38ebf391a87c09bfa145ef6799a140813e813ccc44800cce66f39b8611bb67af659e69baaf887e58b882c2dc1225c4ee610bb4abf3d4e6aae07e08ee
+EBUILD bison-3.7.4.ebuild 2441 BLAKE2B bd46555601a5ca6aad72511b4254cc3b4c5542ca094188f47a91f3ada4fa3805717955143b086d71ae56c67892dff43736decec2a86e84274c223c96b59b7def SHA512 d83b7c14fb8fb3592e83673eb80f26105376e97dadd686778e85906369529abea353cd8782ff4ec4a9975a70f6860638d90e2c484299faf35b09d0e4bd3a2cdf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild
index 4bc651217844..e1e669c683cc 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index ca2e4dca7740..2c6afcf7e953 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.7.4.ebuild b/sys-devel/bison/bison-3.7.4.ebuild
index be6b9e01008e..61db0e9ab17a 100644
--- a/sys-devel/bison/bison-3.7.4.ebuild
+++ b/sys-devel/bison/bison-3.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index d8d2a1157ea6..406251475108 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -1,3 +1,3 @@
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
-EBUILD boost-m4-0.4_p20160328.ebuild 907 BLAKE2B 132ecdf469ee32a1b11d7b771817f4b426c502a2dfa7556e1de9c9519bf14942cf9d596e40f6b440ee9d98252af1df99d5338d3520618527038359bca781a3e0 SHA512 87042561c24a9061cf221426d73d74ddb9232b7d8e1f0215755340abfbe3dce685205096ec5375dd828d2e1452c73e2406c6a6dbd917912625c6d986b87c4488
+EBUILD boost-m4-0.4_p20160328.ebuild 896 BLAKE2B 2b45cd760cd11bf7df3accf17cb5f28750995e835f1cfd48eaf9abc1192e7805c30f62b9397dbc0fdfecfbe939517321b2ef2f996c25d4cb54ed52d9feb0e329 SHA512 7c87e05c209d1d77ca416986b51b938b8d7e13a940291ac1a44793f91a0f6a4e189c5cb936282097721cb25d44ab41a078f49ae6363b4de599dce2189e107d44
 MISC metadata.xml 249 BLAKE2B 4488d5817d75e16c337e26e571768949d36a1bd2ff42322d5f4bb62a4794f44b035dacbe27d62044c4dd205bba2bdb6a909bb82201bd2731259d8ce34da6abb6 SHA512 e720a57bb332e357f42ba922528039e087fc0f7896b110f7142bc7fd2c2e1a807dde3a6f9d9d47d322332f186b77cf01445be4df62d3ad508d697a3bf736d581
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index ac463fac3727..a5d14415fd20 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index f0881033e217..36a41663417a 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,13 +1,10 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
-DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
-EBUILD clang-common-11.0.0.ebuild 591 BLAKE2B 306d03beefbfc18bb39355d549d30b62b651efef5e462564822075d3407f5b5267cf3e1bb241bf97db24d6d3faffe73eac6609d994d196b85374f7a246957a5e SHA512 9ffc10f89e5240e2622ca46a682e5172884baaacc5e1ef6e7aedbe1b2e30376f6c5d238f2cb3d1d6dd69dadbc7f6caac61f14e2f52766feca1f15115c809c127
-EBUILD clang-common-11.0.1.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
-EBUILD clang-common-11.0.1_rc1.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
-EBUILD clang-common-11.0.1_rc2.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
+EBUILD clang-common-10.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
+EBUILD clang-common-11.0.0.ebuild 580 BLAKE2B 3affe14fc54fa11d15701312b51cce47b18aee3dba3ac84004be1d6bb7c70229c6e606ba3c051e038d058d94b9da00ec2710597f945d9bd4eb5cca7c1fb6ee57 SHA512 22d04fb19dd7dc0e7469f920c8ae477680eede237b1e69664c5e1f5f649e4b0d214b38f07e7e3794828c6fd54fe6da8b604d4e64aea6e4e95ed79c6943ea58b3
+EBUILD clang-common-11.0.1.ebuild 586 BLAKE2B 695ae16044b48bb9718d7d2afd9e77b2da305599cd8138b0100ded12496a7a1ff49c038ed020582340ec16d309e52688698150f8a97553eaeda0c115c578a30b SHA512 aef092bacfe504ec8a081c5ea25c2c96ba8efaf0074afe2089a83f4f3091644694d62bcf6c92ec61d9533f5706d949927f20bdd45ef7f3faca086bfbb5cb440b
 EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
-EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
+EBUILD clang-common-9.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-10.0.1.ebuild b/sys-devel/clang-common/clang-common-10.0.1.ebuild
index 636965492422..02b1ebd789ae 100644
--- a/sys-devel/clang-common/clang-common-10.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-11.0.0.ebuild b/sys-devel/clang-common/clang-common-11.0.0.ebuild
index 62ba2b07a718..07e7bbfb813c 100644
--- a/sys-devel/clang-common/clang-common-11.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-11.0.1.9999.ebuild b/sys-devel/clang-common/clang-common-11.0.1.ebuild
index c9abcb48cca8..6dfe0fb8ce8f 100644
--- a/sys-devel/clang-common/clang-common-11.0.1.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-11.0.1_rc1.ebuild b/sys-devel/clang-common/clang-common-11.0.1_rc1.ebuild
deleted file mode 100644
index c9abcb48cca8..000000000000
--- a/sys-devel/clang-common/clang-common-11.0.1_rc1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild b/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
deleted file mode 100644
index c9abcb48cca8..000000000000
--- a/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-9.0.1.ebuild b/sys-devel/clang-common/clang-common-9.0.1.ebuild
index 636965492422..02b1ebd789ae 100644
--- a/sys-devel/clang-common/clang-common-9.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index e7b84bcb4e56..27ac0b1c36e5 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,8 +1,6 @@
-EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
-EBUILD clang-runtime-11.0.0.ebuild 703 BLAKE2B 083804754e5d7c82f8a63095d81cd31349425b1a37da512e80c0e2b1e0e0e48955f75d49535c8d28d2c1c084aeecb692b214246a22c503f380aae782863286f6 SHA512 16afe60399c075bb6f64156246255db2f5914909ad51a9e82fe1ad4607034418f311fc635e5ae66dc750604a7139541553b0e0c1c6d3b533ddcb09aaf7f9eefa
-EBUILD clang-runtime-11.0.1.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
-EBUILD clang-runtime-11.0.1_rc1.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
-EBUILD clang-runtime-11.0.1_rc2.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
+EBUILD clang-runtime-10.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
+EBUILD clang-runtime-11.0.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
+EBUILD clang-runtime-11.0.1.ebuild 697 BLAKE2B 63a0a06a94e6166e01da2fddcee1e0d627a6fa43fe4ec80cae9cafa96cdbae99522e74eefc781e9cf9441752352b13e9d7e8963e1e556847001f6f715c06e726 SHA512 dc8c30f3ce306c18005609017ab693a41081198ce8f2759276c1e49b4ea4538a719e52c921cdc5dd6298c0159fbc19e4a83247bc5a75263654d31f2ef3873ce4
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
-EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
+EBUILD clang-runtime-9.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
index 04d3897324e8..be71ca31a5a4 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
index 0351fd5fb70a..c7b7ec0ae636 100644
--- a/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.1.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.1.9999.ebuild
deleted file mode 100644
index 2713d1f397ff..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-11.0.1.9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.1.ebuild
index 2713d1f397ff..961a678da4d2 100644
--- a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,9 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
 
 RDEPEND="
 	compiler-rt? (
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
deleted file mode 100644
index 2713d1f397ff..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
index 04d3897324e8..be71ca31a5a4 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0d0c076421cc..e52fa9dc9f8c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -4,17 +4,15 @@ AUX 9999/prefix-dirs.patch 3116 BLAKE2B c20ddfc01b1fa205436a093114b886d979d5f7fb
 DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
+DIST llvm-11.0.1-manpages.tar.bz2 180888 BLAKE2B 9d70e83704d77aa5007cc8eb8e667fbb1f4dd3a8df607d0bbf4f3f5049ac04263e6e01bf8da0d212f456a49c90b853485746af68f0a1e2b5f3b704914bd45aaf SHA512 c67df394dd1a94ae632ce55ff1b1aa4cc4aa8b59b17521cd91932c1b44efe90f29e84233a0ebe882d39f54a5b28edf4ef40769e7ecc1a5f1021d64c5f99e33ad
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
-DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.1.ebuild 11828 BLAKE2B e6ee6571b0be8983ea5d23acb899e562758a1cc6f28acc1e82d0b4d8cf5854262fb5f059abf0154e523c075f49ef804255a1ae106982276a1276fd9106d39da3 SHA512 c076072d0c3a1dc91b50dc58af34a0d274217f2d3b138c5fcdeda5e0d669511c1cc5dc3ef2b2332e9bc5b6d8660520def5f03dfb8890c1d7a4701e2915b122ab
 EBUILD clang-11.0.0.ebuild 11810 BLAKE2B 2afbd9ccc9e2c444105f5cf2e490fcefcbbed19a12a4eed72bc46e1ac314fc7197c92e3abb1d570e0ab9684e3f8872dbe5741102bdd9a6f03db0821a4737498c SHA512 5e2884a6518c0b40691e495bcb0fe6beefdfabb08ba9cd946e3a4b220c7bee5539910a818940c41dff823297fa847b08f58251f615cbed78f825d5a2a1cde67a
-EBUILD clang-11.0.1.9999.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
-EBUILD clang-11.0.1_rc1.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
-EBUILD clang-11.0.1_rc2.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
+EBUILD clang-11.0.1.ebuild 11848 BLAKE2B de9b1ea670f71b3aa3cb2ff1f42c86f0587c1a5def505cdd05af121530ab85733a0d9a0ea65b59e8e4624b3346fefed8145b59c8ee62b7af8e5528b63d75eb81 SHA512 1c40d8d85d744f96a1feabd54213037a64aa0e47a9e344a8e03a7cd3a194144b758f47c615c5af1749b0e13907790f4dd7a0b55b604bb92b492fad210fb197c1
 EBUILD clang-12.0.0.9999.ebuild 11715 BLAKE2B 75971e9e6be8c56992c5acf528ce12f5de88bee8444995c91c3d322bc4b1d4346130639c265017520198640bd8d8be1f89ee0c61cbaae2ac4461cb4ca4ad8df1 SHA512 320ded433b9ec7081c3d52a50f418217548f4736285ae89cbf083d1a15240a21f514f55cec2893b42efd66a3f5905aabaa8c9cd1c06fe77725a0a1ff67f6d997
 EBUILD clang-9.0.1.ebuild 9020 BLAKE2B 7c5f8d85d4c6c4d1541c14ff36f2b93ebd553b3ff11e1c9d90dc6eb406b9a7f4072ec08d508cad4efebdfc0d622750a0cba8b24a21b8a053ccabac99bfa750e5 SHA512 6eb0b5558982ad0c43b9478f4ca25c4aadc7a7ed0e4cabd0b918b75613e7d3fac88c0cd09d1616fa88618b7b5b5783b35d3a5b9b9a3b2f7366863aac738e2743
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.1.9999.ebuild b/sys-devel/clang/clang-11.0.1.ebuild
index c5362450b519..888329bcd7f4 100644
--- a/sys-devel/clang/clang-11.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
 	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -58,7 +58,7 @@ PDEPEND="
 	default-lld? ( sys-devel/lld )"
 
 LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_MANPAGES=build
+LLVM_MANPAGES=pregenerated
 LLVM_TEST_COMPONENTS=(
 	llvm/lib/Testing/Support
 	llvm/utils/{lit,llvm-lit,unittest}
diff --git a/sys-devel/clang/clang-11.0.1_rc1.ebuild b/sys-devel/clang/clang-11.0.1_rc1.ebuild
deleted file mode 100644
index c5362450b519..000000000000
--- a/sys-devel/clang/clang-11.0.1_rc1.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}
-	test? ( sys-libs/compiler-rt )"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	default-lld? ( sys-devel/lld )"
-
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_MANPAGES=build
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
-)
-llvm.org_set_globals
-
-# 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).
-
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	mv ../clang-tools-extra tools/extra || die
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Frontend/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || 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-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
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-clang-man
-				docs-clang-tools-man
-			)
-		fi
-
-		use doc && out+=(
-			docs-clang-html
-			docs-clang-tools-html
-		)
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			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
-			)
-		fi
-
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	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 can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# 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_build check-clang
-	multilib_is_native_abi &&
-		cmake_build check-clang-tools check-clangd
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-11.0.1_rc2.ebuild b/sys-devel/clang/clang-11.0.1_rc2.ebuild
deleted file mode 100644
index c5362450b519..000000000000
--- a/sys-devel/clang/clang-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}
-	test? ( sys-libs/compiler-rt )"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	default-lld? ( sys-devel/lld )"
-
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_MANPAGES=build
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
-)
-llvm.org_set_globals
-
-# 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).
-
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	mv ../clang-tools-extra tools/extra || die
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Frontend/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || 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-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
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-clang-man
-				docs-clang-tools-man
-			)
-		fi
-
-		use doc && out+=(
-			docs-clang-html
-			docs-clang-tools-html
-		)
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			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
-			)
-		fi
-
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	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 can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# 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_build check-clang
-	multilib_is_native_abi &&
-		cmake_build check-clang-tools check-clangd
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index db7653738be7..b1b1e0a0dd0f 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -11,4 +11,5 @@ AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
 EBUILD distcc-3.3.3-r1.ebuild 5720 BLAKE2B 94bfec7900c560547f430f81adceb56e0ae8c603190fb8ffc23c1b46e3316ab53cac5ba150fe289a66cbb5c8402cb9632b3c7c787157773aed59b616ceb5caf6 SHA512 1382079267712116dd9b57f4a9a66bf293913e09f9347b50fb5303265a674545d9ec808b6aa09e7f67c99497f8b914050ad5e9388261795689a2660ab5238e19
+EBUILD distcc-3.3.3-r2.ebuild 5303 BLAKE2B a4f9e69486d523a041b034602346221602ebafd515cc6114d00f40329596bab6851c74acc9b156731f8bf2f2d1eb4be8f8011cf24dfe30f9b46e851555b82e13 SHA512 a115d193c2800650abc2791bf7b128271143af32dfe208a1efdaa7a71f537cd42f04ec10f424cdf4e9ab42f4851d991de8825050318a1930a6fa60f0173f6fc3
 MISC metadata.xml 459 BLAKE2B 8d2380ff1e55bf6e7201ea0ab2e4c6866b9c84c1eecef23470e9aa177279f94695c65c4d50cd5ffbb3d98c90ec9a712d9aed96c16238f2eb3c09d1bc5c6d4bae SHA512 dff25af7ec7895d4d2e3f3886614b227a9b62c4376d1736c61ce70e5cdae00124128ee78e89a31c9bc25cff3bc6c3826543ca8ebaf255a74c4611caabe9de1f8
diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
new file mode 100644
index 000000000000..b35b55c2ca05
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools flag-o-matic prefix python-single-r1 systemd \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="Distribute compilation of C code across several machines on a network"
+HOMEPAGE="https://github.com/distcc/distcc"
+SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/popt
+	gssapi? ( net-libs/libgssglue )
+	gtk? ( x11-libs/gtk+:2 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+RDEPEND+="
+	acct-user/distcc
+	dev-util/shadowman
+	>=sys-devel/gcc-config-1.4.1
+	selinux? ( sec-policy/selinux-distcc )
+	xinetd? ( sys-apps/xinetd )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
+	# bug #255188
+	eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
+	# SOCKSv5 support needed for Portage, bug #537616
+	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+	# backport py3.8 fixes
+	eapply "${FILESDIR}/${P}-py38.patch"
+	# gcc-10 fix, #707502
+	eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
+	eapply_user
+
+	# Bugs #120001, #167844 and probably more. See patch for description.
+	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
+
+	sed -i \
+		-e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
+		-e "s:@PYTHON@:${EPYTHON}:" \
+		pump.in || die "sed failed"
+
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
+		-e "s:@libdir@:/usr/lib:" \
+		"${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+
+	# TODO: gdb tests fail due to gdb failing to find .c file
+	sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die
+
+	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
+	python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--libdir=/usr/lib
+		$(use_enable ipv6 rfc2553)
+		$(use_with gtk)
+		--without-gnome
+		$(use_with gssapi auth)
+		$(use_with zeroconf avahi)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# sandbox breaks some tests, and hangs some too
+	# retest once #590084 is fixed
+	local -x SANDBOX_ON=0
+	emake -j1 check
+}
+
+src_install() {
+	# override GZIP_BIN to stop it from compressing manpages
+	emake -j1 DESTDIR="${D}" GZIP_BIN=false install
+	python_optimize
+
+	newinitd "${FILESDIR}/distccd.initd" distccd
+	systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
+
+	cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
+	if use zeroconf; then
+		cat >> "${T}/distccd" <<-EOF || die
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
+	fi
+	doconfd "${T}/distccd"
+
+	newenvd - 02distcc <<-EOF || die
+	# This file is managed by distcc-config; use it to change these settings.
+	# DISTCC_LOG and DISTCC_DIR should not be set.
+	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+	DISTCC_SSH="${DISTCC_SSH}"
+	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
+	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
+	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
+	EOF
+
+	keepdir /usr/lib/distcc
+
+	dobin "${T}/distcc-config"
+
+	if use gtk; then
+		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+		einfo "This is to have a little sensability in naming schemes between distccmon programs"
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
+		dosym distccmon-gui /usr/bin/distccmon-gnome
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "doc/example/xinetd" distcc
+	fi
+
+	insinto /usr/share/shadowman/tools
+	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
+	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
+
+	rm -r "${ED}/etc/default" || die
+	rm "${ED}/etc/distcc/clients.allow" || die
+	rm "${ED}/etc/distcc/commands.allow.sh" || die
+}
+
+pkg_postinst() {
+	# remove the old paths when switching from libXX to lib
+	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
+			-d ${EROOT}/usr/$(get_libdir)/distcc ]]; then
+		rm -r -f "${EROOT}/usr/$(get_libdir)/distcc" || die
+	fi
+
+	if [[ -z ${ROOT} ]]; then
+		eselect compiler-shadow update distcc
+		eselect compiler-shadow update distccd
+	fi
+
+	elog
+	elog "Tips on using distcc with Gentoo can be found at"
+	elog "https://wiki.gentoo.org/wiki/Distcc"
+	elog
+	elog "distcc-pump is known to cause breakage with multiple packages."
+	elog "Do NOT enable it globally."
+	elog
+	elog "To use the distccmon programs with Gentoo you should use this command:"
+	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
+
+	if use gtk; then
+		elog "Or:"
+		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then
+		eselect compiler-shadow remove distcc
+	fi
+}
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a145f8cacc53..c8446be838a2 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 1880 BLAKE2B b5b3a4b93c0eef79b697e0fd5d0fd412fc578a4aa41e3a7f9d6e70f453539a9a04725fabab4cc4d1c9cfd5a8e7495ca205df2a5dc5a6383bcec3a471b495d70c SHA512 bec37a48161b1ba9f8fa2464f8b2576e46ea83abec0ab25592234b07523aeab852e4febf126c782b76c89a0770cb84565b3a7db569f463900bdf30b07b78683b
-EBUILD flex-2.6.3-r1.ebuild 2024 BLAKE2B d68f2431fc8b40107e2c7c09a04e6432fb051330ecc5a2cef7b2755beb4ac0233f1247e54be09065ecf44112a4efc9610b298fb12c2f1f016b073aaa970bddfd SHA512 14ab189f7d8b6cf944121889945afd56809c9e967220877647280be049168c5d7a7d71f00162a6e14424a48eaa948a0f1d8d58098b961a8c952ab52312edcf41
-EBUILD flex-2.6.3.ebuild 1950 BLAKE2B ff3fa6408c5efbe17c7851dd03f5277edda106c10a24966197d2c30604ede9aafdba775e5ded0cc7113c4ef8ea05785e53b2efbf75b3242686df8dd86c65d05b SHA512 0ef7f78b3b93ce191ae986b94994f7a2f0bf693830209222a4a69b5633a73c42e349b968c70c36692930a9f5503f48ff748f8b0478fcf7c066d2d169a6f008bd
-EBUILD flex-2.6.4-r1.ebuild 2085 BLAKE2B 5e0e7e8a1b59467d49a3d437a60ad0c68f9b026fecbd44a013ab3fc8fb69a3adb2619d90c677dbad37505bb19771770d0a323ff4cf818df6ddc2dd955e7652ee SHA512 05797108fc9f35eb62a3f3f25de63fb57a251ed303dca0e6c48b06e3093176bc8e2648d4f3220018502c2fb46367f3b1cc778509b9401b505077a5d18ab0bc56
-EBUILD flex-2.6.4.ebuild 1989 BLAKE2B 98c0335847622b0488776b3e0d41188e0eb3edfe9ebe858d4df0bc303afe02ab13f75aa63002e953532e07429623251b3d643dee12e56eb640b66f5610ba574b SHA512 fcef63744edd59ede93c2921d8f29e086f07bd39da1788199ce6075549af2d19cb497b35ceaa1f79c01b2acd95e2abcc9b2f9740e72b84e14df36177d7af6ca0
+EBUILD flex-2.6.1.ebuild 1869 BLAKE2B 9b26bc3006a345e2bf9bdf867c70a11b4da8722feded6b1ea5209d296135061ffea1c7f59d9b6e1037041fdd07e7a1e4f1efd35e190fc47e8aeb5cc7fd4ccf43 SHA512 493ed39e7116f03bd8520a9c93ecc0890f2843749e5419cf012cf7e00f522e91a02716e3d66a790de3ff7202900744f05ba041ce2ccfefded2dc8caf800208ba
+EBUILD flex-2.6.3-r1.ebuild 2013 BLAKE2B 0825b6dbc2e8366b70cfd560f2d88ff6f127596dde6ed20dd01c26af6c7405969d156c7e6a41d5243ff6bc6de9149b10bed02e605e49252874eb791c65bc3ee9 SHA512 84006fa9fccd333a19c6ab1c313dcfd55db651e09796b96489c1d1da106074fbd8faefa4df4887faefbd9920e7bcd7a8647c6b6b7950e2891f8d192a0ab861ad
+EBUILD flex-2.6.3.ebuild 1939 BLAKE2B 3ffe8be5b5893de5c55873575728523e44f18187596cee9240b1288bc5d0865c2e552f66777956584333035f3ba05289a0502721f9a1b4001c89056a7d3df9fb SHA512 58c9d79c91bba6b3819ebead5754fcc712688ebe7313297e254ad630111a8512b273e37216adbae2616729f421468207d05a1ec8aa97518e68361b58d9e558b3
+EBUILD flex-2.6.4-r1.ebuild 2074 BLAKE2B 7ec754512179432cf6863fa67904f4e9e46e38a43eadf6750358541286409f961debd1c1dca04029897e4158643aa9f9ed6a4ac3350932492a8ded7a337470c6 SHA512 23a1b51fd6fd3e1c9e70d37f96c29c1a160a8d62bef9cee103a1a0898bb95cfc8cb8246f704a41c4bcb5e10270fdb85d80eda4d3140c312e2f9a17797688ecca
+EBUILD flex-2.6.4.ebuild 1978 BLAKE2B 409bcfa1d667e10150e3ca38a117884a09080e9e148d9349cdbae3e020962f27b4ff5cfbdad296adb0e3257c2339b244a44b77d23b61af7db3bd4d3b6e7f5c2e SHA512 d7b3ee7731f7f073c3bc4a9e9dcf9c225370d8e686b1c4a1c4dfa235e3513654318003a278e8affa062e0d5b93c0e257aa3fdb3a8622bf172abc679dcce73cf5
 MISC metadata.xml 443 BLAKE2B 0e02862e2117e571beaf3938e56d19a5134b0c5371bd96e9973eb930a9874bcb103813e4a04f537549282b2a713c5bf882922142041f484a728da83755405777 SHA512 e115e8bfbf3c372f0e7200dc75d523214df2ce59165c43e01db5aeef87bfd7578de9757acbd67efc77e1ee7ac16fc00b99b905d65b8c0528c47de613bed872d5
diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 0fdff4068455..e96485aed826 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild
index aabfe555997b..86c8beada8b1 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index ddb5ad75e7d5..922593293712 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 51c7b0434be4..71c554a4c79c 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 1c80f7b26daa..623bc261d893 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 0cb92fa9eaf1..3c7d63012fe0 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -13,5 +13,5 @@ DIST gcc-5666.3.tar.gz 19367320 BLAKE2B 4b64aa80daa357d1ccf4d2c6f0d06ccd9298dc38
 DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725c1df1e7127dca91611ae9987bf92b7e1a52af82d19f5521ed1112265c1e7f82c833dcc65aeea1ba6ff90f28107b256d40e7eb196 SHA512 94b1c7d343b780e52bbbbc213987feda7d8f7e083d7c338ab244e89e69ba5c2fc74a9695c5f38f273e4e50683ef67b4de85abd4aa0c5c2fe3a28f7bf275dbf3a
 DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
-EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12910 BLAKE2B 8e6f6cb3398f9ecabdd9d0c03e82c2de3c6d6c9a12648f4e3a7f8f3ad880c8268114cdfe55a67c4bff6e970a94d929aa1b20893b788d73b17b9edf78f2d6718d SHA512 fa8b1edf2ce5cd113ca1a5d3c94dd8562cda8831e16b8400e4da46bdff27f3d4541d1f235b1ced0a27fc09adf3b45a9cc1e1fee3756dcf9c93e4a3d3bbd9eb46
+EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12899 BLAKE2B c81f2eb183c754c15695ea6ac1c0bfa0615107a5045fd289f47f0258253554ddf140b5106297675444f89d4a1d12403f4a839009084fa837cf8a5a3b1827e7ba SHA512 4d84536a5d0e02b5235614ae6fc7bce2ea66bcfb886288cfa34b4fb49f142dc5ccbe193837a87b02046d9da4faf412859c387f947779dc97a28bfec9cb06e664
 MISC metadata.xml 538 BLAKE2B 4bde5ad30e15d0d273ed689cc6b703097c168c6494a1afa076450b1fd62a5fc80652092fe36758d6f4866c93ea5f4b6dd778bc8c8924cd082eadf298f909398d SHA512 7713b42bb9824ba9c99382cc403635e1e7ba65cd6ca3a6933ad360a19d27512a1e80cafd3fbd980a7b3bce1dcd7f018b32580b0f471155803792fb1e4f2edb69
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index cfc119b08b11..feaeada61891 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
 LICENSE="GPL-2 GPL-3"
 
 SLOT="42"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE="bootstrap fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest
index a86bf619315c..098034ff34cc 100644
--- a/sys-devel/gdb-apple/Manifest
+++ b/sys-devel/gdb-apple/Manifest
@@ -4,5 +4,5 @@ AUX gdb-apple-1705-darwin8-10.patch 286 BLAKE2B f7f038e870aafe73ee79251bee1441e9
 AUX gdb-apple-768-texinfo.patch 487 BLAKE2B b429247205cb241c1b876d3477310b201ab9191d582daf2f40bae92f782680df3d60fbaf335ef5a91db7bab0fffd87ff8783813f1efca690ae255157f9f98464 SHA512 fb40c8c713e0cdd34df82b368fbae5b9cc4180a6519f303750d72181dcac31436f947fc01c6949bbfc8bf8a7be4459cb2083e821433c1c4e9a587e2171933b92
 AUX gdb-apple-no-global-gdbinit.patch 714 BLAKE2B 188d5f51bec24e54357b451e26e607b53e5009ded5232fb21c513c97e5833636d041d73d0d4411b7b49810a88ec432d3fa4ef83f765a9e5fedbc047478c43160 SHA512 e692621595562f002a8f2d170cf3aed087f09ddb0578e2a8bf4bdac77119ee7c4a921f9d4a10273a3c0b7cbe95299d936c93971b5ff1a73fd528f8d1984f7a4c
 DIST gdb-1752.tar.gz 17922994 BLAKE2B 9b27bca2b6a9f10e01d130d595270300a4e7f0040790c5b60337d41086e1238dc12d785cc88c484df630f742ddfe783f7baefc2132b47e41bb74a5d0b7ebbf1e SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094
-EBUILD gdb-apple-1752.ebuild 2698 BLAKE2B 63525c32abaa7b279c78415473023a9e7085fe5c1ebbbe0ede89c02e714e25dbae626d2821230b464894e6ef9ee01042b8b3e3569c3a2753be24c006f2169457 SHA512 570445bfbd0cab88aadaac552f701d41a6270726ebc81c61fa087700e9c75e87a08dc9bfd6009006faeedf6716d8d3ceea4cba9d0af7198be27965ab07096fd8
+EBUILD gdb-apple-1752.ebuild 2679 BLAKE2B 21d8469b8bcc2dfa1256bd58d1f42faa1d2d7c6d96ad6da451d514d50a17cf03af6ef654282ea80b3459c69a7d7309cad2ca0a8822d55ac41db8289994747bbe SHA512 7d3e7deac145c368a4304c9bf0e1042c7c9c977c1bf83f7d050734cd3c5d9f6e2956bb04b615899a2027ce781c7664bc85ed7b46df9d1689a1af120841b597af
 MISC metadata.xml 247 BLAKE2B 5589fe7154425e3eb144170de1f3a024df3fd2b642731f4565abc21498d16dc424613cae78f8b30f0d4341bd9ed1712fdb3beec8d0436192d3d8612c7db9b7c4 SHA512 ae91bc559b2380b04af0bacbaf419deb042e9a9235c596c1afdbbb3933e59ba4f895c6e7ebf8fa4884702d5b39febedfdcce109ab912d6ef4f51b3696bc82c18
diff --git a/sys-devel/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
index 05d3827575a1..512a1d0cb6f3 100644
--- a/sys-devel/gdb-apple/gdb-apple-1752.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE
 LICENSE="APSL-2 GPL-2"
 SLOT="0"
 
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 
 IUSE="nls"
 
@@ -86,7 +86,7 @@ pkg_postinst() {
 		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
 		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
 	fi
-	if use x86-macos || use x64-macos ; then
+	if [[ ${CHOST} == *86* ]] ; then
 		einfo "FSF gdb works on Intel-based OSX platforms, sometimes even"
 		einfo "better than gdb-apple.  You can consider installing FSF gdb"
 		einfo "instead of gdb-apple, since the FSF version is surely more"
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 5aec6274178e..6c58719d49d5 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -3,7 +3,7 @@ AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3
 AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
-EBUILD gdb-10.1.ebuild 7156 BLAKE2B 86a20db064f9b1df327b6e712a27c89edbc54e8e4bec9a00606e9c6426d3f2a70b4ea0f9e2aafb35acb622bffc701d77ddb74d0af104403f69c0a1e615e2cd00 SHA512 c5702e966c4ccbf18b56d8748f9e77637d21809036baf3a24a387bd6015ac3837dd40e1ba011fcf3458690a2e4d36a7dcc9aea70bab904ff0022e64fc83f952b
-EBUILD gdb-9.2.ebuild 7461 BLAKE2B b5fc2d421a64ec8e0e08e9c43e5009f4355083dee05041b42f4d08bddc968297b310949bbdfe6871343b92f29889dfccc56cb304df1d5c1a4b37f79d3b88b4b5 SHA512 c4a583574c6ac0e9121991778a89df122ecc280974394aca2b5e107ebf049a84d35e72a3a52e2bd48f7b0ad1f2c22b4c40e9443dd885f70da0934d845e18b745
-EBUILD gdb-9999.ebuild 7164 BLAKE2B 3b55f8a4e0b37f886398da704d24a602c4e853bccee9a1ea8a213acce6de9b60d9c9ac46777ce0f2f89805962f1441df655bfabd29871ebac2139b67bb6bc2fd SHA512 e5dcfca04991c32405e691dcb352dfec1e56521393af778016dee9958c4d6777856224d2279901c5a6712fa723ecce162c6b379798e31580cef0517b6a90e551
-MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
+EBUILD gdb-10.1.ebuild 7469 BLAKE2B 63e5171252340a76a3981b9eb33acec060b1adc3774848b131b8b04ba3ead8317dfc7e7a1efd2a286bb7a41355d9a326b05774966cb81984ddad126eb8e77991 SHA512 c239e036e77044c50881181f176b2c243a28cfba92e3e0235c85385ae3d125a258a8ae029208b8db47048ba63ee7da485750598c6f6fac8556d8857858377e8b
+EBUILD gdb-9.2.ebuild 7450 BLAKE2B b8221d0500d8449f154e6d7a721984a81027344cc0a1fac5da00edd62120f1df1502833241c2f7bf0a67d4af554ca37ee579eb2d935d54a985a09363a3ed2583 SHA512 9bccab2de9081ad42ad2ffb05b67ebb8c09f43e5d86d9946eb194689fe5c81f3e2b97211fede00e9d22cd6640eff1bf56f43e26584de98634df8ce2e4cae5c84
+EBUILD gdb-9999.ebuild 7477 BLAKE2B bdf5877a262946d8e98f573e6477b3c1610203c001a582ccad3e91df02f198c673a2cd2626bf21a5d78755dd0422ced81bccaa0f2d6ae7af97776e4e3a793269 SHA512 24107459db353cd31ef54e8b1f77786f56beb07c51dd9f712dd79d16a3fae471933aa55850d5533bb6ec93c8aa8201c076a0220ae6b81df570090f45649bd0cb
+MISC metadata.xml 1185 BLAKE2B 524a340429b56430dcebf53fb141336f5c7b785865a9b2f407c548a79b0babb60b7771687a41a048d2877ced1d81ce2ab0e602bc8745abe01cce4d3baff48ea7 SHA512 cbd91ca72a0284fdb5b848af05f05f7e6895f68a35ecabe841c0b3d32aade02cc46f2bcc13c6a6a991097500487666410fff51959b38e278e1adc21d5691b01f
diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index 44862575ac40..4ceff54454c8 100644
--- a/sys-devel/gdb/gdb-10.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,9 +44,9 @@ 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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	|| ( client server )
@@ -129,6 +129,15 @@ src_configure() {
 		--disable-werror
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
 	)
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
 	is_cross && myconf+=(
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index 18bd40687e66..78740b7e1b64 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index c423dd7af766..c257b4df7b7d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,9 +44,9 @@ 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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	|| ( client server )
@@ -129,6 +129,15 @@ src_configure() {
 		--disable-werror
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
 	)
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
 	is_cross && myconf+=(
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index c0ef0493f2a0..9595bbc9f457 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -6,6 +6,7 @@
  <name>Gentoo Toolchain Project</name>
 </maintainer>
 <use>
+ <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
  <flag name="client">Install the main "gdb" program (most people want this)</flag>
  <flag name="lzma">Support lzma compression in ELF debug info</flag>
  <flag name="multitarget">Support all known targets in one gdb binary</flag>
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index e86c82485f58..2281f2cabc41 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -2,5 +2,5 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD gettext-0.21.ebuild 4313 BLAKE2B 4ad992d4ac9dec4a225c5fa6bfde52dd63997ea2f88ebebb9b654f45d828d4aa6fa531852c9e8b0c4e55528a7b214cabbc5883aabe6df326304922abda671211 SHA512 390a5177257bce5fcca5d15119bf124a11f7d5ec154b45933cc8cfd35628d9dbac85d1fce2501300c57a04b35ee3ce2011709c81d622fab0a66212db2dc10e3e
+EBUILD gettext-0.21.ebuild 4302 BLAKE2B 1e449cdfc7a080864933ec3fbf338e30a6540cac14a2f232d3dfc9113bb633288a4cbcf96fcbbffbe887a0dc6eae4ffcc658fe1a867d22b4c2bca7651887dc35 SHA512 b63f7329247896547825d1a1a66b322fa38bf4da6fb70e37676cc12849b168d3c273032c6bcc6827d6de546cae38465d3f54042946a96a8ffe7424c3eaac62a4
 MISC metadata.xml 707 BLAKE2B e0f7534d0a90939db1d5b7d0b837d9c0c4ba7cc17ece9dc90e7832580fe62a53ed306a77f86c3205bb96aa46d40834b03143d81076c531eabfc92da82d41e880 SHA512 1951f0165d110a484ed68f774106d6f76f5cad612eb74e0386e8ecbb4e71627668daeda48a779ee6b5daab8b2617145e50ecdb0429c34879278ca14868d40d28
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
index e5f049ecffba..20d815cb7540 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
@@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 3cefdba68d72..8e15e4098bf2 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,7 +1,7 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
 DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
 DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
-EBUILD gnuconfig-20190912.ebuild 1528 BLAKE2B 544a3b3f9e4156066a2b27dfe58daa84f0fa9c782213e44e17cfeda6b0f090b35d01e06a8198daf325e7391057dda9fa15657bdf9a8903dbbb5ae51f9a273185 SHA512 3bc7b3c224005700c3f15e910ed4dfcb812397892af84d6c1950d898f91ee80f87c9f8dbb07f211bc5333b6c0fc6a02b21ad330d193ecd9f99db066709e4c45e
-EBUILD gnuconfig-20200621.ebuild 1528 BLAKE2B 544a3b3f9e4156066a2b27dfe58daa84f0fa9c782213e44e17cfeda6b0f090b35d01e06a8198daf325e7391057dda9fa15657bdf9a8903dbbb5ae51f9a273185 SHA512 3bc7b3c224005700c3f15e910ed4dfcb812397892af84d6c1950d898f91ee80f87c9f8dbb07f211bc5333b6c0fc6a02b21ad330d193ecd9f99db066709e4c45e
-EBUILD gnuconfig-99999999.ebuild 1537 BLAKE2B 523fc9c9a9c978204d910db18e4884943d58e5490f8e22bb1c0ed6d36b2c8d1470abad4484c463d2cd884a0c89f3265d98a172bf32f55e0fa0111e350ef0fed2 SHA512 ac0b4d760be624a6235aca49c1f54bffd52e6f4c38ac45968f8dbec6f9f7962e6a12483d709b9326d0aaca3e611265fb28cf92dbd5b8f3e24807dba959c304ce
+EBUILD gnuconfig-20190912.ebuild 1517 BLAKE2B 82a7537439fbdeb3ace78fafc9e80bf560f53525eeac244a9f47e4c5e56f278ca3409af531d2c03888ef5d85f23d8941733ecc5091b6190868b2571e96837831 SHA512 e43e3e9a76283436feb0314345ceee5196f1270aa8f49acfc088c440757cc436e979ad860c229a7be481b363fc229d31afbad2643ed7d8ee17c5440204705d3b
+EBUILD gnuconfig-20200621.ebuild 1517 BLAKE2B 82a7537439fbdeb3ace78fafc9e80bf560f53525eeac244a9f47e4c5e56f278ca3409af531d2c03888ef5d85f23d8941733ecc5091b6190868b2571e96837831 SHA512 e43e3e9a76283436feb0314345ceee5196f1270aa8f49acfc088c440757cc436e979ad860c229a7be481b363fc229d31afbad2643ed7d8ee17c5440204705d3b
+EBUILD gnuconfig-99999999.ebuild 1526 BLAKE2B 36610a808e91e131eac0dd4e5d4f34e9c60abe98d1c926adcc7e33f227dcc5c328c0667f5a3e69cca16994522f1c2543dd389cda45d9f1baabfc22015c41e3df SHA512 1e299991e20a555d89c4b33a1f3c27376ea4a799a94dc6e1736c82baed638c4810da1cf7162bf2f018d43999a10dbc3de1dae7e881b172500f9ac2ba1d1f7d20
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
index 3646e670f861..d47b32a1ba7c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
index 3646e670f861..d47b32a1ba7c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 da4deb0fbc4d..0e97c0cc521c 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 a4504a2bac84..eb871667256a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -14,6 +14,6 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r6.ebuild 3604 BLAKE2B 1db640ec4b991f6f57065b5caa681407f94a496551ff0668090794b10b48569a6b43c6b5e7296caf0b435ad5f87060b9165151df9d9419212e0ae3ccf5dece27 SHA512 66ba0a3ea8253685a779e8c994ad08e65db56e888be7e2fe0798f369df8b298941be4ee43ffb71404dffa96cebdfb77e994f460755b9d02c2669d4253596e8b4
-EBUILD libtool-9999.ebuild 3212 BLAKE2B 3f6d784783cd2c4858d4c05555f2a07d713d2b24b055e145f97fabab64f169899731ac67aa1b8dbf2cb0199bf615fc5ed5f4b7902374cb7d01d23db29d152d66 SHA512 1daf9ae3220d888c8825e4722817a88b36dc11b470a562a3f5f8a066772ea9476fdedad5bb254d125c9700147f900f67d39d858eb26b1e62c741e20f8864b276
+EBUILD libtool-2.4.6-r6.ebuild 3593 BLAKE2B fddfa2208e9b6394a99effd543ca9e816553ad3fb8c9f768b7be80acbcbf132efedb19d5fc460195c50ee0f870450998ff30324711b681dd74198e66641250c4 SHA512 4c70cd12a8d50c2e47c8fb7c88787c4122cf38a869934039c2b65112673a98782cde84ffca14e6d072256287780d02f6501788a61ecffa2c70f4370dc64dd84a
+EBUILD libtool-9999.ebuild 3201 BLAKE2B 99bd172c1d5a5d1ee5355be9c03c174e0164391a795bc02744006b89db4095221f50ea1183599b3e3460a1f3ac261f8833af29a4124d0433178591d9494d782c SHA512 1ffdaa021c89fa420f2bd124a7fcb3a9db18b581b6e2c79168564b1244b65675662956207e00fa1355076dd11ec6e086e50c1e20e8b8db940d2e3bbb42ddf8ea
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index 833792abc1e6..05d90a944acc 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 be27305b3003..ea6a7173bed3 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 52c441067cb9..46bf2bcb3b4d 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,13 +1,10 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
-DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
 EBUILD lld-11.0.0.ebuild 1396 BLAKE2B f57f7373326fee82fd0816e61ac0c4c45a2efac0cd4261b545c751d023f9986bd36be88e3afda9bee7a8d7b226577e0494fd11236a6683ea9ea2bad7f457efbf SHA512 57c50fd9b83a26dfdfb1732867a74264905241f77d31acf1a82e7b3ef09c4867105ec0ce99dc45b3373bd45285c043858f9befc167c44a8d0f25fa3cd89bce29
-EBUILD lld-11.0.1.9999.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
-EBUILD lld-11.0.1_rc1.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
-EBUILD lld-11.0.1_rc2.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
+EBUILD lld-11.0.1.ebuild 1404 BLAKE2B 0823eb53ad364ab1ac920a9dad28c2bcbd5acf8e0f8b04f6684b5133144e0dc86849c35ff8f56b72f3158f129443509772ba752b80f06517d2f3a5b7dea9a8ec SHA512 7f5c3b5a2c508af7c3f499c9afc525fe860f4e1b0438ce21717db5fccb051cc5e2502fc14739d48ba83c9188a2beb2a655459dbf8242172488fe3d4a12adb7a6
 EBUILD lld-12.0.0.9999.ebuild 1777 BLAKE2B 69690e21b7c4a63f24b873ae13ab37f57f7b7a4c564be295ed185657508e5ca0fcf108a4f114506cdf793dfb3986f65bedfa3886a0d548827de172217718af01 SHA512 3aa55f77f6c966f6bdce54cade8c957b8ad6a5d3152c6cf1d104c145ea35536dc8ec577c81f476577028a7828eb6401323fe6deb5fcddbac2865f165f81294c3
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.0.1.9999.ebuild b/sys-devel/lld/lld-11.0.1.ebuild
index 4b86a2bdffef..3b7d2cc87034 100644
--- a/sys-devel/lld/lld-11.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.0.1_rc1.ebuild b/sys-devel/lld/lld-11.0.1_rc1.ebuild
deleted file mode 100644
index 4b86a2bdffef..000000000000
--- a/sys-devel/lld/lld-11.0.1_rc1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)"
-
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
-
-src_install() {
-	cmake_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-11.0.1_rc2.ebuild b/sys-devel/lld/lld-11.0.1_rc2.ebuild
deleted file mode 100644
index 4b86a2bdffef..000000000000
--- a/sys-devel/lld/lld-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)"
-
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
-
-src_install() {
-	cmake_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/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 46176f156381..c4b3be3be474 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,13 +1,10 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
-DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
-EBUILD llvm-common-11.0.0.ebuild 606 BLAKE2B 38a0872487be62c2b5c554dab6e675b9f730de7d41cd703257fceb5a2cde35f8565ff517b44491db27cfa1a3656e3881712ca174aa4065005dc8437cda89a3c7 SHA512 dcd3d8b45d1215402eff9ed81eb24e72910e4dd40cee5cf8a5b5c2603eb650635c9afbfa4a06e2debd574ee39fde5090e2f9036419d4dbdb0c5739f8ca6bd01e
-EBUILD llvm-common-11.0.1.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
-EBUILD llvm-common-11.0.1_rc1.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
-EBUILD llvm-common-11.0.1_rc2.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
+EBUILD llvm-common-10.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
+EBUILD llvm-common-11.0.0.ebuild 595 BLAKE2B 4c0f992968a6e624cbcd73b430b37fd0ff5c108e6af88b2edda0b94d1370b2857dec11140e14e6b949e6353412e9d50eac610f79ae80ac9a917e6db4754eb36f SHA512 56563e4388614da0e7b9efd0022a1da789db772dd593a3101d4d639677fa0217dc822aa602dce719b0ff547be8f102c1a42e1c05c2fee612f9cece2eec27d7a7
+EBUILD llvm-common-11.0.1.ebuild 601 BLAKE2B 570f3217864c54be4846d406b88c16ea8f8f7f8b11fccdd6dd81760cf7fe216cdd991cc5d090a59336bbb4d4eac448b15a809b14c7a248faaebede90cd42145b SHA512 8f85ddbabc6319c75f7e57f3a41d302db2cbcd215919682340d8a421f3117af509fb3c605d0bf79c57a76d226bab34f4ef392550dbe6dd5dd819294db6a7a23f
 EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
-EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
+EBUILD llvm-common-9.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
index d12935e080d2..af57c8f49eb1 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
index 01253132cf67..5cfc96246771 100644
--- a/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-11.0.1.9999.ebuild b/sys-devel/llvm-common/llvm-common-11.0.1.9999.ebuild
deleted file mode 100644
index 4804d9640098..000000000000
--- a/sys-devel/llvm-common/llvm-common-11.0.1.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-11.0.1_rc1.ebuild b/sys-devel/llvm-common/llvm-common-11.0.1.ebuild
index 4804d9640098..c332f7dbbd1d 100644
--- a/sys-devel/llvm-common/llvm-common-11.0.1_rc1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
deleted file mode 100644
index 4804d9640098..000000000000
--- a/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
index d12935e080d2..af57c8f49eb1 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d9355fbab7c4..8409a09bf527 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -5,17 +5,15 @@ AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BL
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
+DIST llvm-11.0.1-manpages.tar.bz2 180888 BLAKE2B 9d70e83704d77aa5007cc8eb8e667fbb1f4dd3a8df607d0bbf4f3f5049ac04263e6e01bf8da0d212f456a49c90b853485746af68f0a1e2b5f3b704914bd45aaf SHA512 c67df394dd1a94ae632ce55ff1b1aa4cc4aa8b59b17521cd91932c1b44efe90f29e84233a0ebe882d39f54a5b28edf4ef40769e7ecc1a5f1021d64c5f99e33ad
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
-DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.1.ebuild 11900 BLAKE2B 069cd18c06aeb6a52f32736bbfe8bd7f9af7050e16298b5653b1b02c326255c41385ab6047052adc2b4c4efd44ccd61ffd20dde8160f48265e1500280612b018 SHA512 576336d3cef1257bf7ae1577d47fd3dc354b9e9d174ff5c75c055f1c306f110fc42313e235caf008308699a66820d1e67de7da3776d40fec3a9e0337f94d0c1f
-EBUILD llvm-11.0.0.ebuild 12883 BLAKE2B a5e1c8ff7655ad03a6f4821a3551f4c0f63751d72db1af1d7f38b9ba2442712feff2ea1593c32340b523bb1d631fac6462ef2484e0479a027a97482539a81a00 SHA512 91db3a3c1e554b7a76be536bb5e62c82679409171e5c7b9167b86f44e7457a09e9e5a3ca1965e2ea38939f41045340e5cbddbe3de84992d6ae11e7c75dbc199e
-EBUILD llvm-11.0.1.9999.ebuild 12602 BLAKE2B d1efac06b7f292a69d10d01d10ab800574054b947a677a2fbedcc9f3eb57af1ad7802b68f68cc634ea7b66736a91aa7310451f73aa296976f7f947788375d44b SHA512 f24943bda4da2ba200634a19c331720af0dda6a24c119bad104ce050844bfbe4a4be326ff0be61ec8987ae9c3f64d0491811f305df1343315dc13b6f1789bbe0
-EBUILD llvm-11.0.1_rc1.ebuild 12602 BLAKE2B d1efac06b7f292a69d10d01d10ab800574054b947a677a2fbedcc9f3eb57af1ad7802b68f68cc634ea7b66736a91aa7310451f73aa296976f7f947788375d44b SHA512 f24943bda4da2ba200634a19c331720af0dda6a24c119bad104ce050844bfbe4a4be326ff0be61ec8987ae9c3f64d0491811f305df1343315dc13b6f1789bbe0
-EBUILD llvm-11.0.1_rc2.ebuild 12602 BLAKE2B d1efac06b7f292a69d10d01d10ab800574054b947a677a2fbedcc9f3eb57af1ad7802b68f68cc634ea7b66736a91aa7310451f73aa296976f7f947788375d44b SHA512 f24943bda4da2ba200634a19c331720af0dda6a24c119bad104ce050844bfbe4a4be326ff0be61ec8987ae9c3f64d0491811f305df1343315dc13b6f1789bbe0
+EBUILD llvm-10.0.1.ebuild 11889 BLAKE2B e5c81e014cfa7b66d784085f8f2c47d8b604a0e18d95294b6f37739d945ec66ee527a36b417fa633e46fe26daa65bc75a276e95e2734578003294d655e110f2f SHA512 7a88759263f653b2573c085ac43372ad6753c25c3c443f1bdcc59b136b5f5758b815c74c7a2312353f5906fce51c0e05e48d17e44c7e07a63986faf00da5240f
+EBUILD llvm-11.0.0.ebuild 12872 BLAKE2B d4c8f01e25c682599419585ae23b498b6ad28e11e93fe35c7a4d7d0a67f45c92fa9289a0606f9b56e5e43162a780bad84bb0ce70f1540cea1358143b685f8d80 SHA512 ef461574bd311482f07e550b0ab18eb3535be9ead64065ced49fa12d7d4e78eb35437ee016910f9d7d1b14ba07231002947fd3a01e88cf1f21185061a1d0cffd
+EBUILD llvm-11.0.1.ebuild 12681 BLAKE2B 5ee9376b3cb8ea5ff1537456f6ea3e998af01a6cc43d1f3d4adb465b67de16e870b6351f08a79e1f3c3b5e8032d0bb814b975da696b459c40776760affcabb23 SHA512 a2ebc8020ca2680021e03de2da8ee94ca4cc221e2eff579230fc6b4fad559a62045e493e868c59077f22f78887edf666d4315c6b41f285bce09435986b6b3a57
 EBUILD llvm-12.0.0.9999.ebuild 12691 BLAKE2B b63824a7f09b43cbd44e700170ab980780a6f3e99040bc9a19a7229ea2ae3a55d3062b6d00f43f7ed46f5799bd8daa277c06bcd0492ef515fe8ade3f906942c5 SHA512 e1712430643f8f44d9069329e6706461ad1a708435dbf44528efe70c0cf277d2b46e6b7edad18ba97356d71e81ca9c183843ddb7c71e1c4893cb815ad2cabbca
-EBUILD llvm-9.0.1.ebuild 8399 BLAKE2B c296c1b0575c295bb14db4d3ac8fac06395e327cf95fda0c7e2263062de7eec6d6ea90cc264ac2b806ee2e6071fdc1c66c496502c2349d44b2364165258b6b7d SHA512 92c550916a048de53623aba4f7c2e32b6e6a35fde794116310f1a265e7e6124bfc8b48f27ae6830415802b5a2ffde222948f40c607d1ae5d96fecbf2d9c5591d
+EBUILD llvm-9.0.1.ebuild 8388 BLAKE2B 502ae7150a7d03c53f181fe4f69ea0f2a37dc94fc5920fab72f65207472c3754db8f9b1449b390121719a611588a46a099b75e8b7956a234ad7bfcff76732bd4 SHA512 d066d32c267ff95eccd39a24e588b6ac526259e5e7ca166a30f6a5a68d544ee433c44d7bfa981129043acd63d761745647ed19569f83ca995c1643ef3ba0fa64
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.1.ebuild b/sys-devel/llvm/llvm-10.0.1.ebuild
index 2c1968b03ad2..36f06277c37a 100644
--- a/sys-devel/llvm/llvm-10.0.1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 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-11.0.0.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild
index 81c796ea85fd..0cbcd376ab36 100644
--- a/sys-devel/llvm/llvm-11.0.0.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.ebuild
@@ -29,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-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-11.0.1.9999.ebuild b/sys-devel/llvm/llvm-11.0.1.9999.ebuild
deleted file mode 100644
index 40ecd173e2da..000000000000
--- a/sys-devel/llvm/llvm-11.0.1.9999.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_MANPAGES=build
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_live_ebuild() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the live ebuild is up-to-date
-	check_live_ebuild
-
-	llvm.org_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* ]]
-}
-
-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-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-lib
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			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
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use gold && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-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)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# 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"
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	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="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			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
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		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 can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	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_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-11.0.1_rc1.ebuild b/sys-devel/llvm/llvm-11.0.1.ebuild
index 40ecd173e2da..bb144c488274 100644
--- a/sys-devel/llvm/llvm-11.0.1_rc1.ebuild
+++ b/sys-devel/llvm/llvm-11.0.1.ebuild
@@ -26,7 +26,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
@@ -66,7 +66,7 @@ PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
 LLVM_COMPONENTS=( llvm )
-LLVM_MANPAGES=build
+LLVM_MANPAGES=pregenerated
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
deleted file mode 100644
index 40ecd173e2da..000000000000
--- a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_MANPAGES=build
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_live_ebuild() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(ninja -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the live ebuild is up-to-date
-	check_live_ebuild
-
-	llvm.org_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* ]]
-}
-
-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-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-lib
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			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
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use gold && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-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)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# 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"
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	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="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			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
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		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 can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	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_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-9.0.1.ebuild b/sys-devel/llvm/llvm-9.0.1.ebuild
index 6f532c4a5308..c0b10c76d144 100644
--- a/sys-devel/llvm/llvm-9.0.1.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 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/m4/Manifest b/sys-devel/m4/Manifest
index 0dc4bc52d2cb..157d4547dce1 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 1566 BLAKE2B 84865a9044f215ab129e4786ddf5418cce90ca1ddb864803800be0bdb2b0557e17a4c0612d460bb09fd278b57f2651e8b5a3d6745b1f66e41fab38285b85232b SHA512 6f5d60f4a8fbec8af69c3d3fa1380e9c9f1c2cf8451e35474eaf9cff505ff74aff23fa4a61bdbbaf400caf6721616e73261a36cd11bfb2c6cd0e3b3f78b963fc
-EBUILD m4-1.4.18-r1.ebuild 1378 BLAKE2B 13a03b05467a6a05fd33027f1d1c38fa3a58b35b1840bab184076e68513c1ac74ed1f50cca301973521e4146d81489d4a3867dad8e97122851335a5c5ee49369 SHA512 700af9028c1b6bc66a79021f790d7fc4e61e392f7a344095a3b6e1254d3d4de60d86881c2305489ce6f41c3cd36c925c0413b1fdc3491b4c4819b16671e19c82
+EBUILD m4-1.4.17.ebuild 1555 BLAKE2B 2ebb1154f51aa295d3b3cdba31c728684d99486b2794781cf13b17e62eb427d71707500afa0c943435aece261487d780dda85b078d276043c6ab1e127f05b3ba SHA512 bbb3f55867a7e7019c5069c154e0c1125eeb80f6ec19184520e0948997818723071ac6e8b3dc52e1919f78635e99e0113c2139b4da40118a322dbdc3bcf7dd86
+EBUILD m4-1.4.18-r1.ebuild 1367 BLAKE2B 498f14f10d7d3fd9cfea2dfc8244690a036e34aac08eda2ea5469a41d3ad39b3226cee8789f25ce1efbbbc05a057c9aff084fe7e595abc688285736afab881d7 SHA512 a89559f8bbfa2f6d0588646b1969fd602235a474dfde05c4130def070167d6565f993a307861539e74d85d5846fd8816dc6282c11fe42eeed5152869264a14e3
 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 80431a260655..631fdde89ffc 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 5c37b4fe7d96..ac15d9604e10 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 1a7fd20f0d4b..c9741752a24f 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -7,6 +7,6 @@ AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360
 AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17e32bd0acd6cb553e34622945b2ea1c7cc6269b0c033fd60a7da19b80b80469e1340f33dfeedb42508e610dd5726c461bdf7d914 SHA512 39c83ee50cc2a5e8d30c77081e3c12e2848ba558bbbb3cc9eade7087a5514aaed13cdbb23caa7d4ab2047e62a65fc638622310b53faa4ff80b20daafb2e33d7c
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
-EBUILD make-4.2.1-r4.ebuild 1669 BLAKE2B 6c483d3b2681a61c8c4584df13f3a01eef5667a18d9a24cfef79ae7f13d8579e0311bd22360fdec9156059fb0c784daf5645a0fa82c74cc8d4c6305fe947c595 SHA512 3625359337503366baee69e91ade9f7ca9108fae0f2f170a81a5bb0a95eb94d11b4f7b498f36f88cec0dd8bcdd517d9c2aeb218ab2f146b2c45ae46352ddd944
-EBUILD make-4.3.ebuild 1423 BLAKE2B 93ef31cb59849f6f5359f685a5a25acd5c45ac3a2b622ed43f575c9b952261b1319d8f96ad1eb338ee3492317b72852b0d6c7a8f1ce76d69651d3c4e98c61d15 SHA512 59e44117be3450b9abd5f05e908430b8b861e3f89ea51b95ee4fac529ccab7fbebc49173764d962dd90999492eae7f8a0b349f38f2ae980f49d31efb8cbf2929
+EBUILD make-4.2.1-r4.ebuild 1658 BLAKE2B a331a9d7abee983366b3e9758d57ff50edcf4e230e453da19ce46875e06f58884985518edc2f29c0d73c2bc0c5f4da064a8ac91b2c883fddebce3fc6a64768e7 SHA512 8cea7411216ff0900cbce9b29c19990c9eb49a19701a084e6a0029b69ae31877e8e37ebfc1e5d06948fc15d5c292756e15fe9bd5aa74629e938863cde430a342
+EBUILD make-4.3.ebuild 1411 BLAKE2B b54ed4d329d8bcdc41c9ef9451fbe715c5756e70b37278eea850d0a0420cdb26b66fe1a5710bcdf5fd29b6880b18803b722890bc34896595d614a849623581af SHA512 e6ee844f0642bfb35040799798e2ca0076365bc7d65b729b64cef0d0a248e7aee325edfaa4b3a38ae2600468008d2cca73eed819db5d512b52d70f1f6e206951
 MISC metadata.xml 327 BLAKE2B c4ff5632d2d92cd0e1c073808261cc162799e186abc0cbf06bec9c3cb18757e325e63dc060e417196faec853dd740701f1bce0436754e8856399e4aee0ef950a SHA512 579ef7fc6e14f725bb29802f350035bc3619e6f06c72e3c496a92c056f15c6baa5f07d7b1aabbf13467629f30137bf2160b9d13aa6fdd65dbd04ee94472d00a1
diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild
index e285a6b2b947..7879250d9da0 100644
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index 82ec364fbba7..6f8771ce9ab1 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/sys-devel/native-cctools/Manifest b/sys-devel/native-cctools/Manifest
index 5616ad9f08cb..6ad7d36521d6 100644
--- a/sys-devel/native-cctools/Manifest
+++ b/sys-devel/native-cctools/Manifest
@@ -1,6 +1,6 @@
 AUX aix-2/ld 2779 BLAKE2B 83b6e5069741a346c80d11069d233fe75d22cdacd2eaa508f705e6401203ff2c175d05a327c2288b0b503b367798f67f8a97354964a908f81bf13f46a6e87f4e SHA512 04ade03ff75ec4cb9a8a4ce5147a9f3ecb47d4c4a51ebf75ea18d68751feaebed09bf666e8a4fa5579d01bcb9bd75a01f58270fc7808e89f33e2002b56ce5b08
 AUX aix-2/mkexpfile 1535 BLAKE2B 8e4fa825cad0bef1bee2e6db348f895e58fbf281a1801d49679971f0de0b466c20150237222e56fbead3da3579945eb481f9cbceb8daa439d82e3e9e903d7e0c SHA512 51491a3b215b2efcbf3a14ee7cc90ea6e9062eb98a939e88671b288cbd8262864aec8cffe481689ba325c1aed125881a2c6a375eff1bb1f4f9902f29b53944c6
 AUX aix-2/nm 176 BLAKE2B a3ca7388a558fadaab1d843ebe684c2c945872bb34423042aacfbadfebc28ef005e63236dde6899aec954dbe1a1c810ce4aa99d5485ed225ad07a3bd435c71a2 SHA512 d5206f7bf3ce54f79c292f9734b028aa8c9d0db811db4cb6ef2a4570f3bd13e38b2e41def4d6053a3794dd0f5ed81b485deee4d27c3db6462035071d7c522411
-EBUILD native-cctools-4.ebuild 2797 BLAKE2B 811aed79772b90a4b4c4cdc187496cf7066dc23aeee9bf2409c939c9bff7dc6bda6064b6c9ba12fa0caabb9dd3b197e0dcb0345b6df2bc24904a19b6d6e6100d SHA512 d25198ec930da3cbc2437d88a682e08155e38597bf356b32dc4a4f6bf5cfb2b0dcf5b3af3041ca42751f75d5e6361f9974b6dceb923ecbc510a42798fee9b381
-EBUILD native-cctools-5.ebuild 2990 BLAKE2B 664d77ef17ee7ae16381ba5c6bf87ab2131d01cf8bbf2f3f8c59f1eb593932aba33cf093099d71e6b1fce343f25b320290a958f1b81d6d4a167d6a581228ebba SHA512 71023b29c2b973c7d47734b07586f53ff466cc57e8c11824abb84e164ac14ad0d204606de169ba301f7a77a46fd6a79eaaa12f7fe84ba938c0b46d1d9a91bdde
+EBUILD native-cctools-4.ebuild 2786 BLAKE2B 81a597b677ed776c5c579a524c5232f68d2974b36434af140488a5191b200843c6a52691b054d36dde7c1a7044851df48b7ad52bc4f7a0caa4c422ca5bf72886 SHA512 fefc52c46fb89416be1f0253d813e96ba8c4bac6412a20c2a4188bb3fd84a78d7d96dad9688225339c8ab9ec354075b9dc3a78819f3ef20e4bd2ba5b0a19732c
+EBUILD native-cctools-5.ebuild 2979 BLAKE2B cbf1f360016d8c86307351fac77a617a27c8422afa0f793124b18d474f8e77e8514eb3749e97310467352b5ffd3211043e25feaf8ceae2cc5862c0e375d0cd8b SHA512 4a94230061da47256612f9ca5bdd7e63091b420d43b4740adb8a22c113b291bd8edc37c99ad45a9b8c20defacd4f1a4df7f45b1986656c616437f4ac319fd988
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild b/sys-devel/native-cctools/native-cctools-4.ebuild
index 3072575483dd..f961a43cc039 100644
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ b/sys-devel/native-cctools/native-cctools-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild b/sys-devel/native-cctools/native-cctools-5.ebuild
index 0187a4d1380c..821c9fafacdf 100644
--- a/sys-devel/native-cctools/native-cctools-5.ebuild
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 6b5b498f9605..bba1c66965c8 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 1664 BLAKE2B e462e290b39e275207eee5a28e25522c16897e7705a365b2dbbc52a2b2ee82b90b1f207846d4531146d59a56fd521750b2250ad4d0a3066738d19bcb609d201e SHA512 492dce517998c53a314c854ac3658b57c90bbfad9299b67f945ef16112d2ea5b767af4fe11f07c7c5e763cd662e8a140a28f6bf99b6c69135130b6a140a5ca62
+EBUILD patch-2.7.6-r4.ebuild 1653 BLAKE2B 6cf9cbe7f4d03ff84f3cd8115c2797ac0e47b8c24e27484a30e11d90f7b634428a3994d205bb66714c8457563927130804f0c972270cb867e2b05882953b61e2 SHA512 6956a139ea7c388680082c1c81ede828527d8bd525e92cc3ad44805200752a24a992469df6117fd25062e1f0c87397f52b113a53efb481f536a801aea5b70f2c
 MISC metadata.xml 328 BLAKE2B 6a3240f3e5e4ef212d5ee9026d5fa1ecec9eb6ad1ea4d954226759e78e4bcdf09c18d0b0e8e1b62aa1d1bfc929ef280e0275587fd3415d937c5f8e19923bc7ae SHA512 9e888ae2f01bfc94f333b5ef5ef11d40f82c42864ce2eabcd2be2f122086565e0ae2c21a9a08d0b62d91b541833aabb05991d8b78126e8bd68e2ade1a1a71130
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index be2b3d2052c6..e3ec281181ab 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"