gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /sys-devel
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
92 files changed, 554 insertions, 157 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 246e9da47ee7..3b3ee0566bd8 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 8db67d344528..55a014a29432 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 714 BLAKE2B 85637a94c43623771b76f603bb386688927349d7c94e5aa8d2dca5f07bc74d606035b1a5dba418253410ae18980fcb2f42727fe6d544bda28412a85163d34b37 SHA512 18f5dbb0ac6a95b2c2438ea81502402995b864a717b3e4608a324243a350027d234f03251a264f51e89639dbbe52358dc9326d3c68698c036e1472f716171c70
-EBUILD autoconf-archive-2019.01.06.ebuild 658 BLAKE2B 3a740a3e34d3f66b6cbfdf7cae75dfc69d7ae2971d12709b93a04f0b03e2a0dd40ad59d1b2c166c19642f046722b9a12c40400c4079d61174022b933357706c8 SHA512 aeebe42ba7d141486d6cc6fff6ad137a40f67785474849c1b1053a9bff89f230f99e16280cc2cae7e74803422443b7781373f62df0c22d279ef7877251e9dd31
+EBUILD autoconf-archive-2018.03.13.ebuild 705 BLAKE2B 186befd9997845bbb4a4cfc813101998853043b53498732edda01e433e7376c2195c37fc10fbfc2500f2249ea59b88e02e93596ebfa1879a66425d9f049534aa SHA512 133e1e34855bf00d9f68c0e29d8d2ab78859b96f916eb2729f1b7b033f2fc5f88ee68b337d77275baa60849eec2f0710609e87c7bd025136341b9a7ad6873ce3
+EBUILD autoconf-archive-2019.01.06.ebuild 649 BLAKE2B 52a2c2f056f13374ac92837274766584bc6b2a618c4fc2766652cdd33c09c9e7fcf539d9acf71c3bba85b07ffe0831637f1673a868c29f82c57ca60dba0aa510 SHA512 5cd8bf249f0102e3ec10f4b03a681c4598e2bcdac3e29adff5537b1c9f7c1b8443607494efcd77867e97e03a31b6b3dcb20bfcb832b27f106144e753255ea433
 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 302ed4d68244..0f8fbc214da3 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
index 76edd0e058b9..1d1b30aa2c8f 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 8a09fa9705b9..9d9a5c44b01d 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 816 BLAKE2B a5b0e9c7047aee1614b6af4ddd0d82307af513fb56ce0b2256234eb268a184afd7cb1129b5521a8b03fd1936505e951f89e9a2b33763689cd68d38353e1a9cd3 SHA512 cd35df1e8a453812f738ec7820862815fbb7124eb85ee95b5aa3b93185ac395193aec23ea3f1d540da25a84630347a69a975c918fb85c0d8118ad2f3059ca08a
-EBUILD autoconf-wrapper-14.ebuild 854 BLAKE2B 5a5b2a6dff654e10fff1477922395b074728d15ec0f9e139230935646bf3b600d73873cb24311d36609db1171e444b8dd0a3358c953f17968a23ef21acf4c33c SHA512 0eda50d8bdd3c8500de6c7cf759b9d20ed4c55215bf97414a7693e3063649878f8117d14e615fb595845e95cf676b477005ae9aa3a4e0f181993892d7f4c1cdf
+EBUILD autoconf-wrapper-13-r1.ebuild 796 BLAKE2B c2819720c91b82fe3d6801470dac7f2e489e13f12123f66dc92f0015ad8de429fca3b0ca31e32598633021221f2503e74c4de8040bb197b95e83ac63211b1d7d SHA512 e528fc5b7a7bfe5aacf23b5ab6f9947cd7b3dff2e3020b845ba75acc2b663acad6dc690a0090e9f817d30991423b9096b61eb64a6377a1ea85d2dda4ec0fa4ff
+EBUILD autoconf-wrapper-14.ebuild 834 BLAKE2B 89ad884df6ce11a78cf7998907a83f31cee40259a9a1c6ee6599f54bfc2043dbad9c28230e6e9076a2eb3a556c313607eb6efa5aa6afff4ccfdaa6e07d434d93 SHA512 44d835072dcb2fff7142620f4d938ee2f8094aadbccb5bdd47aeb92c4be55aa9a7268dd9265cc437209e9463f1dfea227bb8a08047032c49cb218d1975e7e346
 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 ab9bc2e3bc8a..bde33cebf586 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
index f2ed66df32cd..d630e5eb99b2 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 34a6a9b22235..9be1f6798649 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -7,15 +7,16 @@ AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71
 AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
+AUX autoconf-2.70-fix_c99_check.patch 834 BLAKE2B 387ae38c3a6966efc802f0a9b0f12c5cedb09696b8dde08a78ca7c07736032b6815f8dcf6ceef9e9596973f78e48e4464865e68eea8d694f169f64ade92ada78 SHA512 fdb7cd4b6e87ecd63c99306cd5360aede9b7ec9e4b8c17ae43d8b821ea716ca15966243f091743e90444868eb54b5f5e29407d8bb844c1ef812c7a02d8caa6a4
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 DIST autoconf-2.70.tar.xz 1346528 BLAKE2B 7a14f966f1fb89a250aedb03d483ab1f92d73a7085bc289094b62984620563922d041e717274270af0afaf52f058b4c6402c1af14cce58d70d5d884414797c80 SHA512 af4af6b8811baa424c00990b368a6cbfb1d598dde9ee08dce2a5fc32cb9517e6e683a59d6852507f6a72d499fc298c4171b6f06962cf3ba40cf1557cfb6069fe
-EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 30a8d2ddaba7e878177c86ef825d41122c7c99f24ab77169833e0172bc3c3fb6f9879c3ad48863c4c0a2f305a9ce304f072b1afd02d3c01fa1ee5585dd14cf8c SHA512 033383d86e1b2097992a79e9078a931557041af2ddc09f02a3f256343a40ba5dc5ef5380232d1c88b6f0716936cb599ecb789a9a3b9af5be8bdd713f1b9b4ff9
+EBUILD autoconf-2.13-r1.ebuild 1530 BLAKE2B f4daa60dc1598eae9e05788f1f869db80c9e548f2ad391ce5469b6911484192f63cfb3d5d22c7c4bce46355c674b43c94c3c45b8aff78717d9971736ed37e91d SHA512 d77d846fdb6c22a20f447b6bc9efbaa33b3e69ed8c7a41f33b1cffd171af6594d6f06db05e643ee847012eb6e60b68e0aaa125f46695aedbf46806d21feca8da
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
-EBUILD autoconf-2.69-r4.ebuild 1331 BLAKE2B bfc38c5419976a69f7c8e80c26656760dfd2305f3fe6c18571cd9367017b5d564d761e314171da186b0f9e1a02a72b3287269f52fd9bada941f064b2da8dbdfc SHA512 77ea183450866b03f924af1455fd499c95e7db55493d457234d28966cae1edbaf267bdabd019d11b7260bb071a1f067aaaf6c5175aad3625119988148a3f5020
-EBUILD autoconf-2.69-r5.ebuild 1850 BLAKE2B 45922efec9fa94ffcf56da356e0d38d21e5e1755e1994e390db9e91aa0ca8e6208d844068814f0d3d4100f9b7ff020b4db5c00f5678a1726b27fb9c222443fd1 SHA512 fec9311883635861b4bb225b83f65fea7fc4f4d24b7e93a73120130a1bb74a075be1090941d40d72207e23b4108bd569b83e149b4438e7816247988e7ea28be0
-EBUILD autoconf-2.70.ebuild 1824 BLAKE2B ed92fcb25ee8a8afb9f4e7c5495f6547bd2a94a44c57081b14412b93481de001095cb84c5818e6a9b791ef0abdc3a8ffdf43303ecd785ae07d398b34d40d3415 SHA512 9f379c0f6bdf3d96ce1c9c2a8a8597a4ebf8a983acd2ab9678144332b5029f76d5de657356d1d8c71e7e093cfd3e2a94a6d61ee799e58cff3de8d956fe45e43c
+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-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 065065a18ce9..9a3e4927330d 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index e7b5c6a68445..e2f9e6cee1a2 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index b8561415e619..3000e01e360d 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.70.ebuild b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
index 94c959125e22..ce4adc5321b0 100644
--- a/sys-devel/autoconf/autoconf-2.70.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -35,6 +35,10 @@ RDEPEND="${BDEPEND}
 [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix_c99_check.patch"
+)
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
new file mode 100644
index 000000000000..2174e75afebd
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff_plain;f=lib%2Fautoconf%2Fc.m4;h=601c2df41bd4ee602065ce041a1173aca8a0f52e;hp=fe217cad679f2f4506c3e20dee64e7e3e3b83a24;hb=efc940dc82763b7b2d6e65f04d15d5972d829c0a;hpb=b693e208691c54fbe07cdf49b9a98358baadcfe2
+
+diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
+index fe217ca..601c2df 100644
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1559,7 +1559,7 @@ dnl SVR4			-Xc -D__EXTENSIONS__
+ # option to output variable CC to make it so.
+ AC_DEFUN([_AC_PROG_CC_C99],
+ [AC_REQUIRE([_AC_C_C99_TEST_PROGRAM])]dnl
+-[_AC_C_STD_TRY([c99], [ac_c_conftest_c89_program],
++[_AC_C_STD_TRY([c99], [ac_c_conftest_c99_program],
+ dnl Try
+ dnl GCC		-std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
+ dnl IBM XL C	-qlanglvl=extc1x (V12.1; does not pass C11 test)
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 5994baeeaf8f..25267e27a30a 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -4,5 +4,5 @@ AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-EBUILD autogen-5.18.16-r1.ebuild 1906 BLAKE2B 7a84dc620f54079876a412aa777c540badc5150045104bc6dec6a9038f4a7dd68b77373d22c6935ec0328e67c4bac53bb857eaeea1b9c96032f3580cdd920f95 SHA512 4bc7921f4257f84e54f7145f3bc9e028da855be682cd0f66ade16c35c73dfdab5557380e79537ca947f34f65d140f9f74b69195844cd2da0f3aebfc518a54c41
+EBUILD autogen-5.18.16-r1.ebuild 1897 BLAKE2B bd32a7125d9ce6f13c4fbb395ac734d11b1f6bfe81910f21d34094bd3837b114d631de7a20fb24767e43ca6315125b7df7006a387b95153f7f25e3af9aee75e4 SHA512 9097e30b7d8af1a028dfa53f8cf9f140913f5b68235299508b123a8e948e851c695872cb2ff69aa1a47d83b6218bfcd3818719aa0860ffe2c55f62912efe8726
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index d56d463d60e2..f823be3106e6 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 49ba71397806..f8d239c00a7b 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 928 BLAKE2B 075e0703acb9cc64f7c83df860fa146a570255d6926ef4969e7648ce65e59f5ec74819e4cb04ab745a86e1d4d0cc2235e3a60892b0947446108e545337425127 SHA512 a0b2b047ae995f3cc47379d8f0e03ce95c6832009bea3524add4ad12719b5ca15190a09d9751a936e264b3e0b23f6468ab6448e48a26672c8bd4c6f8c08e5d5b
+EBUILD automake-wrapper-11.ebuild 908 BLAKE2B aa5feb2c08ed035be419fd6e24cb078e5b3782233483602e9660c8a09a4d22502f49c2b7c890cbeebf6cafaf853cc54604261b2a2219aa4ea28a3a588f56a822 SHA512 3ae8adf0c2c757ad260f010b79cbe172671ccf94dd29b158bfe340dc145f121295aa2480f0ec35f436f76852d566a13a4e3e41f2c1b16d2f1c08e4ea782f4d77
 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 62a12212c05c..5691852dfd3f 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 5a942407c5b2..8a7069594505 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 2673 BLAKE2B 4f9ae5f5af93438814b9a4704370c11c4fe5e83f4bb2e3aa230bd2996303d13ebcbddfd0b218d484ee6710d5f8dbd4b0d9693600e19a00e104319a90d64a4061 SHA512 6ab14110bc87a1040a919ffc7c4083253fad241000290bae9c5e1e7d87d516f2e832a33d46f145e81b869d0d37eb0789ac7c8af63874228373edb65e4506a549
-EBUILD automake-1.14.1-r2.ebuild 3052 BLAKE2B 9f9127fefca8f16ecf0de2f072f85d428bfe199f81e93a82e7ab43e758aba9dd98f7371c11a699abf524865663af9000739601ae1c56e5e87c7057580519b78a SHA512 8ca5a939721c97e28f34f4e8bd4c6dc8dd0079b3b092f7a02e045541a66ca90828809431ff76de2cdb4c9d16ff15aeb6e03675b1205107fcf5850176069a7069
-EBUILD automake-1.15.1-r2.ebuild 3222 BLAKE2B fb0da9250436fa471435d93df44acaaba32903b7dcdce1a4eab92679d0ae92710b36246e7480f63adb181dfa14cb9ccfe6e7f8dfefbd79b8cd2f39d9a4845819 SHA512 d103e91a98f614130f0736a843e944eac33b5f9ee6c3c5d52152c193386ccdd11363db286f39bf063f4845f8463ef08066a1a5337345bfd8cdc2157234720165
-EBUILD automake-1.16.1-r1.ebuild 2940 BLAKE2B d4a8801f4dfbcff936b960fef2af6cbc3ffbea408e9123ff9bf410d1e53cd479f6d11f02a648ddb2d2dbbd9786f98443333becb8304cfe7267349c584ebbcf81 SHA512 499e4f37a028f51e7113e37ecbbed445888dc09b2a62dd8c3ab43afed91789d1d9878a25f011aefe825c18259ce5ccd0dfcf0e05b95598e1425bfcad34c0d866
-EBUILD automake-1.16.1-r2.ebuild 3630 BLAKE2B 4623977d5598404a613dfee378feb53b97ae5c724c6fccbb5a236ab4861c2755e05f0777155d3182ffadf6b777f90a88dac881c7a2bb356b7c1ad1f30f304153 SHA512 fa5f121283bee781449981d985b571fa244503e17713e679cb2c3845631d472e614c5f6c98c91230288bd9ffed16bc88ac98b8c84f2414618ffc174f5b0547b2
-EBUILD automake-1.16.2-r1.ebuild 3569 BLAKE2B 35a59134fa538998807daba5a2f8ac3438bf9b9a0a554d6e9a929b7b3f501889040235045359c32b2bcd6c801707bfd78f3e98df0f94f50aec79a74c05979ff3 SHA512 d16412bc257248130715ab528f9a708b1d3d1b0ee54ebf7d60253f075a345c97acd4056d7036a4e8cc4dd4e3293642a52d19046211febffeff1a71721b09522d
-EBUILD automake-1.16.3-r1.ebuild 3505 BLAKE2B 3f1e55731cd5a7b82019c6619a65fd82a728e7d3ec64f429f8e13607c6d953384036e3dd7e2fb9afeb0bf5c8ee5785a987f8bff78fd63b679b95ef9e302ec644 SHA512 7002c53b2731a9eb4132f69a3636d8325b85ab7f6e2ba26cd5710402b69bfb6b6a829966c2daa56a855300fdac031324942fee9240476d207e9d398590bff3ff
+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.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 3412 BLAKE2B f4b1237ce15109e4d586720afa780d7d169b13d896966b4fd0326b239dc4c93942062e90f0f3f1d42e5cb754f9e68e71f7c11dcacc7541cbf478e956f1a2e1f4 SHA512 760e399700bbe1580b060e7d07dad4e4f219bf5d03e2c0cdc5be9b0bb24952140e444311f3308cfe781882c3af4354d4d0a16bd5a7a0385251965b556852e3cf
+EBUILD automake-9999.ebuild 3392 BLAKE2B 01a4f1365c3f58b55d33ee08e6bf0d34d8f0e2205ae8d072aea23db0aacb36e5b644dbe423e3f5a14141bb12d00ff0cd26f16170236f3d97ae7a1d31bc4426fc SHA512 e3595276a3433ad2887d0f97bcfe46a279805e35abafaa8ede667e539fb1a52591978071ec92218b8fc3b69aae419e59fd26fe94c7ae29f5cbe330d720b45a4e
 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 21c2e6bf016e..74606b6f9b4d 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 3d8d7f660278..57832b559709 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8ec205e95c9c..a0f8ee157fc5 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 fb84f2113fed..c431e1c5063f 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	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 e66657f4e190..4f08be21237a 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	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 a40192308de3..8d0e9c8b3213 100644
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	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 361141a285ab..7d33235a2938 100644
--- a/sys-devel/automake/automake-1.16.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.3-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	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 4dcd0a59fb5a..e51d9d8f778e 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	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 e2166ce6e369..42466686c550 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 1588 BLAKE2B 66aa356a0b450248bcc592b258709c65766fe1a0c7fc6b688b8364b6258354f42a7d13683ed789cc0f251384ba7d6253419d2aa0b8594fc86c5fed655e546dfe SHA512 4d9952440921c045695ed7d8e59b2606a99c89d4f7573517dc80251bd2265a99e0a0d5d9c79e346c235c2eb8b9ad144fb7d1c1576ada62249b17b64aca22f09a
-EBUILD bc-1.07.1-r3.ebuild 1450 BLAKE2B 04ffa209121ade8f8c3599b553353b81df15f33a232568035a92d4929e5c53ec6feae70ebbef7800d2fcef26095bfafae28ed81558bd9df4fee1a8821dabfb64 SHA512 36bd8a77c2885c2977301cf2fc1b306d3f2de6362c15c8121bdf4bb0cddc9282c126b8ee60f1166e79f06394ba2ada1ae68158a52f28f51d085c5163388a9788
+EBUILD bc-1.06.95-r2.ebuild 1568 BLAKE2B a26c81ff32f9044f0672535852ae97c888f5612b6aab28e5ae78067240a46cff9e99a1d4f91215d56ce2a50b3a65d000f11f752a9cc338d3a47a0d063616ce65 SHA512 1a65cc50f7705a409a809b121c6c07c51c51facdbaee60bdd1b3ea81bf839a38413c5bb710a94c59d05001faa95eb0e4da84e945aa681b8c86f2dc3750a484b5
+EBUILD bc-1.07.1-r3.ebuild 1430 BLAKE2B 8a077f558dbb24ca83c478b8c9858bc6e4ae5e97e6007303cc08ef68d736b840747a1129bcad8552fb07c5165c142587240c5cddeec36045fbd5f046266e3ecb SHA512 751f179bfd8459766d56b8f773a9748f2ee0650b8290c642ba8c094b365a11788671a0842879dd96f0bfd63d5a00c2f1ce8972782ee5c1bfcffba8ee5f2ac3fc
 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 a350ac6b754b..6bd1091b8a16 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 e6c6010fbe34..8edcdd7127b8 100644
--- a/sys-devel/bc/bc-1.07.1-r3.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index e4a06d366627..7dc17060d7be 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -8,6 +8,7 @@ DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ea
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
 DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
 DIST darwin-xtools-8.2.1-r100.tar.gz 2934997 BLAKE2B d0324d47d3aa0afd0007fbbd16c74e046c643c645744cc7ef0535eeed275c2d61763a1c6708b3a0a796f0fc83e62b5e5fe907c62553b439bea750353cfac2f73 SHA512 7000bca61b1dc63d1d08a9bcf104dace4376c2656af0faddc28a7d6c3718dbe54713da96136091a2024a644eaf90758714d1e4eb3cfeec2df0e412d847f59c30
+DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
 DIST dyld-551.4.tar.gz 832297 BLAKE2B e65c5b2ed90af6ec94f1295efc984404af99f0e5dc666bfc854379f13fd2e98b8048fae84b7bc8864fe27112abf12f741a33cc404b18ae7c88b7abd6a1d9e3c6 SHA512 896281c4b2330c92ed538af58f1b60906ed0a9ffa3099a5e8ef9a15b7ed974259bf546fd2ab7562739f2c8cf1fdfb44ea0ea7567092c77f2ea2cab377da064b0
@@ -19,4 +20,5 @@ EBUILD binutils-apple-11.3.1-r1.ebuild 12072 BLAKE2B 503efec8e7918f50ef1dbdc12c8
 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
 MISC metadata.xml 501 BLAKE2B 98bd13a9501faa366c3a7dd9eacea30192cd55429102d920df8722e2565eac472f2d814f09c5be5c437b86a5d404af797d521f0fc1fb4dba374e23af31fccf6a SHA512 026c997212e2bec4698613ad9f5517c5a4427d6da1cd8a8afe3d2f549edbe80f3a17d0c345961a9dbbdc730e8b6b33fdee97f66b3309095803ced0fb9202b899
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
new file mode 100644
index 000000000000..3e02d9be4c80
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
+HOMEPAGE="https://github.com/iains/darwin-xtools"
+SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="8"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="tapi"
+
+# xtools uses c++11 features, not available in gcc-apple, hence gcc/clang dep
+DEPEND="sys-devel/binutils-config
+	|| ( sys-devel/gcc:* sys-devel/clang:* )
+	app-arch/xar
+	tapi? ( sys-libs/tapi )
+	!tapi? ( dev-libs/libyaml )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
+
+src_configure() {
+	CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
+	if [[ ${CHOST} != ${CTARGET} ]] ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
+	fi
+
+	is-host-64bit() {
+		case ${CTARGET} in
+			x86_64-*|powerpc64-*|arm64-*)   echo YES   ;;
+			*)                              echo NO    ;;
+		esac
+	}
+
+	local mycmakeargs=(
+		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${BINPATH%/*}" # cmake insists on /bin
+		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
+		-DXTOOLS_AS_USE_CLANG=YES  # default to host as for unsupported targets
+		-DXTOOLS_AS_CLANG_USE_HOST=YES  # search for arch/as-host iso clang
+		-DXTOOLS_AS_SUBDIR="${EPREFIX}${LIBPATH}/"
+		-DXTOOLS_LTO_SUPPORT=NO
+		-DXTOOLS_HAS_LIBPRUNETRIE=YES
+		-DXTOOLS_TAPI_SUPPORT=ON
+		-DXTOOLS_USE_TAPILITE=$(use tapi && echo OFF || echo ON)
+		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
+		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# cmake insists on installing in /bin, so move bins to the place we
+	# want them
+	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
+
+	# move as impls into LIBPATH, such that binutils-config doesn't
+	# create links for this
+	dodir "${LIBPATH}"
+	local as
+	for as in "${ED}${BINPATH}"/*/as ; do
+		as=${as%/as}
+		mv "${as}" "${ED}${LIBPATH}"/ || die
+	done
+
+	# provide as-host wrappers, used on "unsupported" platforms: x86,
+	# x64, arm, arm64, the main reason here is missing support for
+	# instructions, e.g. the as works fine, until newer instruction sets
+	# are used like SSE4.1, AVX, etc.
+	local arch
+	for arch in i386 x86_64 arm arm64 ; do
+		mkdir -p "${ED}${LIBPATH}"/${arch}
+		as="${ED}${LIBPATH}"/${arch}/as-host
+		rm -f "${as}"
+		cat <<-EOF > "${as}"
+			#!/usr/bin/env bash
+			exec /usr/bin/as "\$@"
+		EOF
+		chmod 755 "${as}"
+	done
+
+	doman ld64/doc/man/man*/* cctools/man/*.[135]
+	dodir "${DATAPATH}"
+	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="xtools-${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-xtools-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-xtools-${PV}
+}
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 02a9e0151f70..d900c9d76d5c 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 2450 BLAKE2B e0f12639263a3ec5110e336ccb617f6092c8710b1d472e53a02365c3df0b1fa4afeb60aa5df893359fc52b92b6bccff30cab24e48e1d6ff767b435f6640eab98 SHA512 84ee2cc222833074b115f277e5a97dc9825aa919a8aa63fe8df3b8d3a739cfb6be6f48d1c659ec54ee5acc0b58ffb33b2a425fef8c144dfc361bc1d28e9ba8c3
-EBUILD bison-3.7.3.ebuild 2463 BLAKE2B f1b79a57e017e834b3ea0a19c1d61c237a223e543c74fc56d43a04b46f9aec56e7f37b6c13f9cd3db871daa12dc474ad597d238a81adc095bd37f9fed78b13d7 SHA512 733c04bcb3d01b99103b8cc07dec16a4fd93196587dfea3a6a7ec7d4e3c7ab39884b9e494f551d6fb25913757e9ab3cf541e73d81c6460d5a9df0706583315ac
-EBUILD bison-3.7.4.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282
+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
 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 abac383069b0..4bc651217844 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 d41c7bbdc0a0..ca2e4dca7740 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 8a91a8bc81aa..be6b9e01008e 100644
--- a/sys-devel/bison/bison-3.7.4.ebuild
+++ b/sys-devel/bison/bison-3.7.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index bc5b9f724e5d..19756270cef9 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -4,5 +4,5 @@ DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeb
 DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
 EBUILD bmake-20200318.ebuild 1137 BLAKE2B 5ceb9e88fec798df6afebae8dd6534a95ee5a977369a52bd9dde1525c471a0fd838cd667e3c5c1d7ce3a29f6e9fc449c1cf011fe75cdbfd5a397410f99cf3860 SHA512 aab466bfc237621ba3f5f5840b93c4fef6b42464f0c302380dad7d3caee053ec7b6510136188ffed382a8017cb44f41e36155637e1d6d51c1ba0bd15faaaaccf
-EBUILD bmake-20201117.ebuild 1153 BLAKE2B 295bbcaf658a897daa1230d6c89708298f81939577185b29e59bc047847806e7d74d49b2112982017263bccac260dcf861e9f2cadd0579731d81fe48cefbc4cd SHA512 26454ca0d09c9964072ae5f7f219253fd2efd50825bff391d782dafafe7fff800c596b25d970f16a4b9d8c018b0ad9f9379fb17deb06a49fdabd09b19763db55
+EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20201117.ebuild
index c6523437bb3a..78a6f067ab38 100644
--- a/sys-devel/bmake/bmake-20201117.ebuild
+++ b/sys-devel/bmake/bmake-20201117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 720f80d4c72f..0d0c076421cc 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,5 +1,6 @@
 AUX 10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch 970 BLAKE2B 564394bea7e9d5a056e7ce39b3e5261f1214637084c1669d34e4d9c3296582732765654ccc2dd76507df2d7fb8406da4185339134fa52bb5c38a2335a55b4f50 SHA512 41050092b31b2558b2d24665f4b5b5bde8b7d50b979c21d57c6e59119dcfa95c3616b873214a8e986268a20436c0895b702547adeb44d6d7576c89de1ba2d587
 AUX 8.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
+AUX 9999/prefix-dirs.patch 3116 BLAKE2B c20ddfc01b1fa205436a093114b886d979d5f7fbd1efe1ba9014c42a22da4ebaa231567cc406dd2a2714cf4338d0da8e43889b978a84c0b822df89edf6979d26 SHA512 a1e156bc5054c3aa08d6ba5e7b4c681404826bf9e3421c819d5ef216d3eff2291c70985f4f9435ba5ae24a7689239f398e5d348c8d4b0a524d220ef7b572aaf1
 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
@@ -10,10 +11,10 @@ DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c617
 DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 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 11582 BLAKE2B 90fae946ded4ba69c2ccd2b3f489255f16e3d1568d6e01f700c26ccf075db7bf313a2190f0495b82fd604f1c14331172f3e0ba517fbbc19cb0d7695f7d0c1353 SHA512 6d1de2f567c938bafecba2536eddd6629b388c3dd9f14130e13eaf8ce64550b9e3745bb35328ec481becc0ba67720a20ea4a6146a4971695b14b913d7d5d5236
-EBUILD clang-11.0.1.9999.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-11.0.1_rc1.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-11.0.1_rc2.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-12.0.0.9999.ebuild 11498 BLAKE2B 4e715e105fe646e9c3af7708685ca1758702f1becb42436611b628dfeec7241a63c5e8feb407ce25f708c4ac58ecacd41a2677e05fb687e8d96a0869633319dd SHA512 adf5827949ccdc26cb159caa96dccd42b21100898a73cf98388cd4cb42d0dbe054b245c18957f4de36b0a6141a7bee7e1393fcc3d6c290f2a7c88285b6593bf8
+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-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.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild
index cf0dde1f1604..1d4f4bad16c9 100644
--- a/sys-devel/clang/clang-11.0.0.ebuild
+++ b/sys-devel/clang/clang-11.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -30,7 +30,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux"
+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}
@@ -75,6 +75,10 @@ PDEPEND="
 # 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
@@ -88,6 +92,11 @@ src_prepare() {
 	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() {
diff --git a/sys-devel/clang/clang-11.0.1.9999.ebuild b/sys-devel/clang/clang-11.0.1.9999.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
 # 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
@@ -90,6 +94,11 @@ src_prepare() {
 	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() {
diff --git a/sys-devel/clang/clang-11.0.1_rc1.ebuild b/sys-devel/clang/clang-11.0.1_rc1.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-11.0.1_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
 # 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
@@ -90,6 +94,11 @@ src_prepare() {
 	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() {
diff --git a/sys-devel/clang/clang-11.0.1_rc2.ebuild b/sys-devel/clang/clang-11.0.1_rc2.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1_rc2.ebuild
+++ b/sys-devel/clang/clang-11.0.1_rc2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
 # 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
@@ -90,6 +94,11 @@ src_prepare() {
 	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() {
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
index e5da1c5cedb4..8ebb9ceea5ec 100644
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake llvm llvm.org multilib-minimal pax-utils \
-	python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
 # 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
@@ -88,6 +92,11 @@ src_prepare() {
 	BUILD_DIR=${WORKDIR}/x/y/clang
 
 	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
 }
 
 check_distribution_components() {
diff --git a/sys-devel/clang/files/9999/prefix-dirs.patch b/sys-devel/clang/files/9999/prefix-dirs.patch
new file mode 100644
index 000000000000..d8d79b8fb513
--- /dev/null
+++ b/sys-devel/clang/files/9999/prefix-dirs.patch
@@ -0,0 +1,72 @@
+This mirrors cmake-*-prefix-dirs.patch
+
+It add EPREFIX to search paths for c/cxx headers.
+It also adds EPREFIX/MacOSX.sdk to search paths for c and Frameworks.
+Assumes that c++ lib and headers will be installed in the prefix.
+
+Also, a couple of args are populated by inspecting the SDK,
+so, default to EPREFIX/MacOSX.sdk when the sysroot is not specified.
+(This does NOT set sysroot).
+
+--- a/clang/lib/Frontend/InitHeaderSearch.cpp	2020-11-30 12:53:42.000000000 -0600
++++ b/clang/lib/Frontend/InitHeaderSearch.cpp	2020-11-30 13:57:52.000000000 -0600
+@@ -445,6 +445,9 @@
+   // All header search logic is handled in the Driver for Darwin.
+   if (triple.isOSDarwin()) {
+     if (HSOpts.UseStandardSystemIncludes) {
++      // Add Gentoo Prefix framework dirs first
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/System/Library/Frameworks", System, true);
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/Library/Frameworks", System, true);
+       // Add the default framework include paths on Darwin.
+       AddPath("/System/Library/Frameworks", System, true);
+       AddPath("/Library/Frameworks", System, true);
+--- a/clang/lib/Driver/ToolChains/Darwin.cpp	2020-10-07 05:10:48.000000000 -0500
++++ b/clang/lib/Driver/ToolChains/Darwin.cpp	2020-11-30 12:57:15.000000000 -0600
+@@ -1737,9 +1737,9 @@
+                                          const ArgList &Args,
+                                          const Driver &TheDriver) {
+   const Arg *A = Args.getLastArg(options::OPT_isysroot);
+-  if (!A)
+-    return None;
+-  StringRef isysroot = A->getValue();
++  //if (!A)
++  //  return None;
++  StringRef isysroot = A ? A->getValue() : "@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk";
+   auto SDKInfoOrErr = driver::parseDarwinSDKInfo(VFS, isysroot);
+   if (!SDKInfoOrErr) {
+     llvm::consumeError(SDKInfoOrErr.takeError());
+@@ -1921,13 +1921,14 @@
+     return DriverArgs.getLastArgValue(options::OPT_isysroot);
+   if (!getDriver().SysRoot.empty())
+     return getDriver().SysRoot;
+-  return "/";
++  return "@GENTOO_PORTAGE_EPREFIX@/";
+ }
+ 
+ void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+                                             llvm::opt::ArgStringList &CC1Args) const {
+   const Driver &D = getDriver();
+ 
++  // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
+   llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
+ 
+   bool NoStdInc = DriverArgs.hasArg(options::OPT_nostdinc);
+@@ -1969,6 +1970,10 @@
+     SmallString<128> P(Sysroot);
+     llvm::sys::path::append(P, "usr", "include");
+     addExternCSystemInclude(DriverArgs, CC1Args, P.str());
++    // And add <sysroot>/MacOSX.sdk/usr/include.
++    SmallString<128> Psdk(Sysroot);
++    llvm::sys::path::append(Psdk, "MacOSX.sdk", "usr", "include");
++    addExternCSystemInclude(DriverArgs, CC1Args, Psdk.str());
+   }
+ }
+ 
+@@ -2017,6 +2022,7 @@
+       DriverArgs.hasArg(options::OPT_nostdincxx))
+     return;
+ 
++  // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
+   llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
+ 
+   switch (GetCXXStdlibType(DriverArgs)) {
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index fa231d4105b1..d1de1153a905 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,4 @@
-DIST crossdev-20201122.tar.xz 28308 BLAKE2B 66da19024dd03e98ff0f388cdb9bf76a968ef4ac920249e9a782d46c1d32a4cb3047a0aa2d9619a054b9894ef30624ce99bb45f9c45b937fbb280a8a298aede8 SHA512 bbd7ab6a8ea0d2cb13f822277d9b8c19478368b2f365aaa60bd2548b47f9e7a582805593b683631ebb20bfb6d2f496f2d3a5eb6d144207fab58607565a8d1a41
 DIST crossdev-20201129.tar.xz 28372 BLAKE2B b59d94a69b83f8db9193bd54ff6059b20617b6dd60c0f9a0ec5acdf4b93adf747886598b9af7d69d2fd9705fab709041a96c149286e623b6557ea709bf2f840a SHA512 7b49795ea266d90e45c48b092bffa485a7207c66550d797297cb7e0756f7c497d045b3cb9b90f50b80a3ada4916a3ba273b2c19b9d02c834fb47d906efe3a8ba
-EBUILD crossdev-20201122.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
-EBUILD crossdev-20201129.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
+EBUILD crossdev-20201129.ebuild 842 BLAKE2B 9ac9710f850e7a53c47d78622cc92fe0ceb56ccf7ce5fe9adb8f98d24efc26522d9c40d809a54d1eaf6a8845d4b5cddc300fc8bf489eaf555d16c16bea368190 SHA512 6e89650e3defa290c954d0e98263066500a09cc19776987d987b13c97b3bd19da0fa5aa03296e737c90d8fb3c1b2e65ed0c27053984133b0c168cfdfb14549dc
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20201122.ebuild b/sys-devel/crossdev/crossdev-20201122.ebuild
deleted file mode 100644
index 7a6c51ec73f2..000000000000
--- a/sys-devel/crossdev/crossdev-20201122.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20201129.ebuild b/sys-devel/crossdev/crossdev-20201129.ebuild
index 809478863946..ca781e39af17 100644
--- a/sys-devel/crossdev/crossdev-20201129.ebuild
+++ b/sys-devel/crossdev/crossdev-20201129.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5c778c968853..db7653738be7 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -10,5 +10,5 @@ AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964d
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
-EBUILD distcc-3.3.3-r1.ebuild 5719 BLAKE2B d690a98ea23d743cadbee205d689feb9d1c30e8dfc39d347f53ec2e887802c3bfae92bb99a786459748edebd85ff557edf3c76169048baafe16d341d8b5cb069 SHA512 d5bf5a823ce19a166e9ac4a39486991bd9d442572c2ffcc194c7ce9c516331acbbe35afdcb627462624cbd0cf09b97742aa0907b6cb5f499d6b0957040202b6d
+EBUILD distcc-3.3.3-r1.ebuild 5720 BLAKE2B 94bfec7900c560547f430f81adceb56e0ae8c603190fb8ffc23c1b46e3316ab53cac5ba150fe289a66cbb5c8402cb9632b3c7c787157773aed59b616ceb5caf6 SHA512 1382079267712116dd9b57f4a9a66bf293913e09f9347b50fb5303265a674545d9ec808b6aa09e7f67c99497f8b914050ad5e9388261795689a2660ab5238e19
 MISC metadata.xml 459 BLAKE2B 8d2380ff1e55bf6e7201ea0ab2e4c6866b9c84c1eecef23470e9aa177279f94695c65c4d50cd5ffbb3d98c90ec9a712d9aed96c16238f2eb3c09d1bc5c6d4bae SHA512 dff25af7ec7895d4d2e3f3886614b227a9b62c4376d1736c61ce70e5cdae00124128ee78e89a31c9bc25cff3bc6c3826543ca8ebaf255a74c4611caabe9de1f8
diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index f4d8d84f5eca..cd993af0db33 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 701ed7f6ac3d..a145f8cacc53 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 1900 BLAKE2B fe292f42310ca72b56acbbc613190dd242cd69f9b650eab845149b290588af7049a63c03112b04a919f701dbed3761c22da0ebee6a585f48e14280f46f4d8b40 SHA512 541083f9c1b9d05947f50c7fd9da6174d1ea68bd73fbd8006161771b1e77d4ec69b22be0ebc53c20c38ac80dd4e2edd65725c36bbbfca36ee8d20af8821a40a8
-EBUILD flex-2.6.3-r1.ebuild 2044 BLAKE2B 8d1a67ad48a320dabc5980148196786ed3d121c2053b08f7c1f9b4cce0157f10b77abcabc58957ca7853bfed8fa42e0906851c6cb3afebebee33684621dfbf73 SHA512 ad58be31183ccd6c6d4e0dba8327b1c5af77a7451d52dc42d76924b0a912531e4e8b7fa0b4b64432c60b10c02b3d03b22b6466d76d4186a56de0cc7173816620
-EBUILD flex-2.6.3.ebuild 1970 BLAKE2B 7e5d68765f51b29649f7e9a8ff5aeaf6b097d31118e00a691a35d24985f13c12c0bed0240c7350407c7606cc8c551377f7d1de501788c1aedf2c869d65603b3c SHA512 0de5e511498063e8ce497f8722a25e0f6d0fbf582928b0d4d00af3a5f5eed305d8e8d1bdafaf27c7c2094d31efa1d97100372fd18795870426c1083d84dad566
-EBUILD flex-2.6.4-r1.ebuild 2105 BLAKE2B 0ba2bf14b8f2b66033a7de50635485b4114dae5c1f571f1356d1260c35f4026d55a790990b1a2e27b130b0496efc4972533877dba8f7f90710496dcb02ede7bd SHA512 b4514bfac001e96d19dc6de4ea9ad517908834293266eac00587b59ef6ea9a92b050e22a34deb87fa4e1cc4df7301f8a6900a3f6c369a370503944dd89c023b6
-EBUILD flex-2.6.4.ebuild 2009 BLAKE2B 25e93054e0a10548053185a2b3af311bcb85cf4940670e8fb5d1ae18b4b87b4c61a45dc51ff03bc09a4679718f6e8af4ba78926704ff8a47f2e3bc723c004c00 SHA512 d7454b849e7e8ccf1da433137511fab7d0c279a89e5b246cd03e6b2fc97823a566f3bcdc8ca43228f493936f9c158d4f5d7adf7870d8a093d185a2a3de74598c
+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
 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 762b101fcc05..0fdff4068455 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 845ab4577661..aabfe555997b 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8cc2ec6deb07..ddb5ad75e7d5 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6d18e2634000..51c7b0434be4 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 51d7ff1d2936..1c80f7b26daa 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 879828d8e9e4..27aa7fc21e60 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -14,6 +14,7 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
 DIST gcc-10.2.0-patches-4.tar.bz2 23266 BLAKE2B 8173474d3dea27a440b36eb80c89aabb08c37528c3ec2382839c46fc36336aff7f9cdf3dfbc66947df9286b1cfe9f479d615f77d81ab24ff68a3edf5df5b2350 SHA512 17080f358a3f231837de35188ad1a6ae554a4ca6199efae6dacf9b17706937379559d6c8de330b4237480fea6f5cffffc1158c1d5ecc36ec3a7b410546a2684b
 DIST gcc-10.2.0-patches-5.tar.bz2 24415 BLAKE2B 08d1e2409a6013f8ba3c14b60a5db773b0ca18b2df71bb1c11aa3ae76bba69d88ca4e7a33d2a7a012bd36bff15c55d5ada9b53d3e36c210b9a5e7aba178327f8 SHA512 04292690aa221849c16432ee165a3aef8ad81dec0acc68a0499b3a4256eb8dacf6c1160ac91053c0b84f30a019bfeb121bb21b6ffed3dae15a5b8c24f1e870df
+DIST gcc-10.2.0-patches-6.tar.bz2 24103 BLAKE2B f719012f86136ad9c4ea1397548caca6e69687534599a88cc25fe0e4f83dd7fd34c07375fa6e612e2b430e078c1a59913160cce07312e94fa1ce575a33e5457b SHA512 61d97dba29024c7a22806689ebf33f5cb9ce099230bcc344f2865b976c3fdfd8ebec5962eaffd0156de75eca58499ba785867bd4a4ac92c6f799ab1bee8844a1
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-11.0.0-patches-5.tar.bz2 12815 BLAKE2B fb5d467422de29bee6cd4e1b822ecbe1cc1a0364288f6ff37b43ceb12cf96618dcc072ddc5b1311e205996cb1d528be28641870ce03a51fa1d65ccf0c8c4d075 SHA512 6ebc28998b02c2fdd6cbc8b70a9c67a9de08226880b11bd87f512e9b81a04d9d78597faab3814c27f7bd6bed51513119d580eb828b0d4891768819c028aa48db
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
@@ -28,6 +29,7 @@ DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 EBUILD gcc-10.2.0-r3.ebuild 434 BLAKE2B ba1fccc8fa386407cee7f758fa6d0b9b989825f6a796d2d18e90e9fea25f5dbd07ac911e61eb11edc226cc0aebb6b27016d8be008755d7e6a9ec0eb1e35e0169 SHA512 3b24b9f05039720b05ba55e2399f0b6251dbb0cfc15587855ba888620d459cd9f1dc0b49c3df0a49414f0f713c021d800108226a4f88897491c47ff3828d18ff
 EBUILD gcc-10.2.0-r4.ebuild 434 BLAKE2B 36c6583bfbec07d3b1f264e640c5ad9422f6833fa4dd9e382bd22e0177f1485e3aef68290cc1104f9796bd380823538fbc14e76874c3ace2196dc0ed5e18eaa4 SHA512 57eca9be43d772c7f5ca9e8c1729ff33647afcc49cc3a62fc4c5b5dbaa4b87a186734baa9ceb6f7bbeab0a3174159745cf8dd2353d172a0ad34758d2bd7a6fd3
+EBUILD gcc-10.2.0-r5.ebuild 434 BLAKE2B 2bd91fc954ab2cb09988ae74e9e69f02faf6e2032155405fffe586b39d5582541dde9628a8820dfcf9f7eaa01fe5a1fe602fb23ea48ff9fdefad391e2c2910ec SHA512 ea0cbbfa8b8635ab4a29fe464846aa65744a4130f881a2fbd2c9c0cd208128a31874db59aa55c434a7354cd03f682f0ded8948de72a6ca35e92cdced53a3c6ec
 EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108
 EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B c439da4d9eaf4512ac7ad516a2ce726e08a64e2bd60b2288738f6997855ef873a046e679781a237bbbfbc57b8ea36e1a92d428a06f0dbc3c797716127a6b55ef SHA512 b5f39fdd33f9dca702963492e010f0e397580ab1d0a7fedaa23c2e6da63ecda14db6253a02a4aee30c0151ea9437a2ce2ec1027d01574a076ee267737272b132
 EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
new file mode 100644
index 000000000000..7d2f30f038d7
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="6"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 747dc79318a8..5aec6274178e 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 7165 BLAKE2B 2e20d2bafa03818e0b22bde5535fae5884907e859886db5250e226a83835f83ce39a9258400e70ebf80810de1c20f009c468706b33de5765b2e592c1bfbd8654 SHA512 d9a7108496cc4dc5c17314b85e9c8e7e16fa33cbcbb0d0306229869e1e86e43337ab9923d8c6b1a5d4b724bd5c53ff138aedfefc9204f486c1b6a3007abba09e
-EBUILD gdb-9.2.ebuild 7469 BLAKE2B 9fcca08080e8fd0b31e85ad4e292988a13617ec826f0fea442a19b6244f245a6d9c0e3983d20fef97177e3cbe41528f062e21eb7e540f60bc88131576f6d8d06 SHA512 3f4e01a010783d72d68bcf3ffe478fdf1fb46a41b308673b943461651e5c1436fc76e6c7082e7e5611abc2a031e25e0a8b5c553f30e15aff1759c7348663c265
-EBUILD gdb-9999.ebuild 7173 BLAKE2B 621aabb53ea074cb4fe5f026c6122db7b1a5464d4cc03baa058a33a70e67bb26cb079be996386bd74537e3a73e99e6e2ac8fc250c4952db6e4e5e4845e9122bd SHA512 579a08cb435104c1a647dbd7289f886822a6e54cbb799a9787d64b534db199dc671c49b2ebf66e9f02c05cd665a9ec7e10d1ca4c3b5ad31d05bbac5be435610d
+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
diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index 6d2efc19161d..44862575ac40 100644
--- a/sys-devel/gdb/gdb-10.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index cb10cf1b5d50..18bd40687e66 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 1645237331c0..c423dd7af766 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 4448f5353814..e86c82485f58 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 4333 BLAKE2B f645d92f811361660355427597ecca3133bcf3c9bd76e67f5bc86e4d6ec85f2da5c8c39532a473b43b75b60da18623d73584e65b0ec8d12be3ad8f2920c5a33c SHA512 80463d925cc6354b54375d9dba6b8185b7bdc9db55900b58b354d5ea650f45e37c5b4d7a3efb09ee84393d6b849fbad02c3f8fe0bccdd1d36486184045cc03a1
+EBUILD gettext-0.21.ebuild 4313 BLAKE2B 4ad992d4ac9dec4a225c5fa6bfde52dd63997ea2f88ebebb9b654f45d828d4aa6fa531852c9e8b0c4e55528a7b214cabbc5883aabe6df326304922abda671211 SHA512 390a5177257bce5fcca5d15119bf124a11f7d5ec154b45933cc8cfd35628d9dbac85d1fce2501300c57a04b35ee3ce2011709c81d622fab0a66212db2dc10e3e
 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 ab4ea5395c5a..e5f049ecffba 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 575d8813ce66..3cefdba68d72 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 1548 BLAKE2B b44a18c7db697ac543a22a053f88795f7878197e7423fe7bd87f5251fb809adbb286ffd327bb80c31bc53e31d84c3b26fc538127b5e18beafbb2acee599c5b0e SHA512 201c163870303f9f69e36deb4cfa02245de71967db9dbb133b1e1896b79ba577735f33ba0cbde7de2521d0494ca9b180ea43d894accab4de62a37adde59a1eb4
-EBUILD gnuconfig-20200621.ebuild 1548 BLAKE2B b44a18c7db697ac543a22a053f88795f7878197e7423fe7bd87f5251fb809adbb286ffd327bb80c31bc53e31d84c3b26fc538127b5e18beafbb2acee599c5b0e SHA512 201c163870303f9f69e36deb4cfa02245de71967db9dbb133b1e1896b79ba577735f33ba0cbde7de2521d0494ca9b180ea43d894accab4de62a37adde59a1eb4
-EBUILD gnuconfig-99999999.ebuild 1557 BLAKE2B 82a3eaa40598939e87696d0d0f9fb093a503a510fe881a3c5ad02048f65abb10c8c635338da13bd1b6b73e3f27c3ee8807eb5440b93d10021c92ee1026d15674 SHA512 efe9a929a2b8600fd4f3a64cf3e49d82de304571fdda88265bfcca1461a8ae4c00af145848927539c899b1e4920b5ff1b50e05f03fa3522f149b9c6ce95bcce1
+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
 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 5f08bb075907..3646e670f861 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 5f08bb075907..3646e670f861 100644
--- a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ad59ded956e1..da4deb0fbc4d 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6d96d0f5f625..a4504a2bac84 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 3624 BLAKE2B 2be51bc5104de932d6ff4ce9780f10d26a79fe7273a13746535ab5f1b12a1312eb17a051a30b9bb94866261ea4034616d52bac5718135ca91baad7ef0d32de59 SHA512 31971fe38402a8f0dfad5ce6d34650f7f1ea859de2c9356aa519ac13412545eadea2f62fd62ca9db5db57dc3dad6e3f5593ae2d44f043a979bafa34fe8bff518
-EBUILD libtool-9999.ebuild 3232 BLAKE2B f434eefabfb1d28837c5e3589678835d281adac44a4334ec0c9be7eac54f3873cd7e84ac00f54048742fae6e96f0b256a680b697d93b44029591e6052e3cfe57 SHA512 309a4430005152d74b0bbfdc2feb7a4a337025caf73659a502e7463962e137e937b32893ac50176e4429cd19963786fdbf32af81943f5782c65f2266b60522d8
+EBUILD libtool-2.4.6-r6.ebuild 3604 BLAKE2B 1db640ec4b991f6f57065b5caa681407f94a496551ff0668090794b10b48569a6b43c6b5e7296caf0b435ad5f87060b9165151df9d9419212e0ae3ccf5dece27 SHA512 66ba0a3ea8253685a779e8c994ad08e65db56e888be7e2fe0798f369df8b298941be4ee43ffb71404dffa96cebdfb77e994f460755b9d02c2669d4253596e8b4
+EBUILD libtool-9999.ebuild 3212 BLAKE2B 3f6d784783cd2c4858d4c05555f2a07d713d2b24b055e145f97fabab64f169899731ac67aa1b8dbf2cb0199bf615fc5ed5f4b7902374cb7d01d23db29d152d66 SHA512 1daf9ae3220d888c8825e4722817a88b36dc11b470a562a3f5f8a066772ea9476fdedad5bb254d125c9700147f900f67d39d858eb26b1e62c741e20f8864b276
 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 7a5cc2bf6dcb..833792abc1e6 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 edb5530b2803..be27305b3003 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 5c2d7736e54a..91d974138f33 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -10,5 +10,5 @@ EBUILD llvm-roc-3.10.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f9
 EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
 EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631
 EBUILD llvm-roc-3.9.0.ebuild 1529 BLAKE2B 07aac1728864214e61ed45cee3ca718c7830835502fe9e6c1e5ba5d6fc8303f3b644b0bb3476f8a1adcaabf09e961b3b55bfce34312b953e8ba855b7f36cdecb SHA512 5b9755c9c06ed465b58d8ca7c677211c04cb05eafaffee1e558b26d3d3bc033a1b8d6b1b3e69732441edd9f14cbf608da919f4eac3e283f5f4226dc332ffb68c
-EBUILD llvm-roc-4.0.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f935530410e9f9f18cc2178606de298266200c258c2d23bd857198ff41b292d072d0e2c03154b9a640a9ecabf94af SHA512 46771c99d57027271c61dc45d057ee5848745affa5018d218da166dfd4c20f58a38ab2dfede1c42ccb306264b0c81ea6d267353bad34cb6a0d34c2d7255a3608
+EBUILD llvm-roc-4.0.0.ebuild 2211 BLAKE2B 85b023669ea3c5ca0f8838983a6ecc75abcf3031bdae2cb21674db3facbdf44319b10009cc5b63f4b772e4417cbd31ca8b624efff544761b9dba5852e711c5cf SHA512 0560eaa5858c2e94a88e59eb0ec3de8cdabe9f8e3e10fc76bba5f6e9110bad366df6c83623ce704fe7737191190426253be147310c6547a4f0e9e942d027f320
 MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
index 2d3f39394110..64b2abf582b3 100644
--- a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
@@ -33,6 +33,27 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 src_prepare() {
 	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
 	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+
+	if [[ -n ${EPREFIX} ]]; then
+		pushd "${S}"/../clang >/dev/null || die
+		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
+		eend $?
+
+		ebegin "Use ${EPREFIX} as default sysroot"
+		cd lib/Driver/ToolChains >/dev/null || die
+		ebegin "Use dynamic linker from ${EPREFIX}"
+		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp
+		eend $?
+
+		ebegin "Remove --sysroot call on ld for native toolchain"
+		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
+		eend $?
+		popd >/dev/null || die
+	fi
+
+	sed -e 's:/opt/rocm:/usr/lib/hip:' \
+		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
+
 	eapply_user
 	cmake_src_prepare
 }
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ef2a83819ec6..d9355fbab7c4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -12,10 +12,10 @@ DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c617
 DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 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 12856 BLAKE2B 15e4f40259f637a12a67bff0ed1c76c9e80547304370f48a31c00abe73b74a65d34e63b606e43b91e3bae87ac45c0804128bfc1946899b3f1685f7e6cd6296e4 SHA512 4d0cb037ec5919f3a0a3b56e3c59b7e16a5d0c1284908a709cb08faf2cdbbed9c6fbd3d77e59103938614ec7471293043c6dbe80a842ea03ae5c02538dfac4b5
-EBUILD llvm-11.0.1.9999.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
-EBUILD llvm-11.0.1_rc1.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
-EBUILD llvm-11.0.1_rc2.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
-EBUILD llvm-12.0.0.9999.ebuild 12664 BLAKE2B e1a606a81a25bac625bf7847b779e79a27ccf7558b4e0438304146730609cf9f4150e7f585fa02805cac0d58b6dda7f748751413cd6165895be34d4884fe41c5 SHA512 e71e509e3dab84173da46e18ef19c172141b96b4824a12e46b2f70ea8016cd3c79aad2fec43e3978869cdb3c56307db1d0d1083ee889a86af488ebaef66d6339
+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-12.0.0.9999.ebuild 12691 BLAKE2B b63824a7f09b43cbd44e700170ab980780a6f3e99040bc9a19a7229ea2ae3a55d3062b6d00f43f7ed46f5799bd8daa277c06bcd0492ef515fe8ade3f906942c5 SHA512 e1712430643f8f44d9069329e6706461ad1a708435dbf44528efe70c0cf277d2b46e6b7edad18ba97356d71e81ca9c183843ddb7c71e1c4893cb815ad2cabbca
 EBUILD llvm-9.0.1.ebuild 8399 BLAKE2B c296c1b0575c295bb14db4d3ac8fac06395e327cf95fda0c7e2263062de7eec6d6ea90cc264ac2b806ee2e6071fdc1c66c496502c2349d44b2364165258b6b7d SHA512 92c550916a048de53623aba4f7c2e32b6e6a35fde794116310f1a265e7e6124bfc8b48f27ae6830415802b5a2ffde222948f40c607d1ae5d96fecbf2d9c5591d
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.0.0.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild
index 332088bd5615..81c796ea85fd 100644
--- a/sys-devel/llvm/llvm-11.0.0.ebuild
+++ b/sys-devel/llvm/llvm-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
@@ -381,6 +381,7 @@ multilib_src_configure() {
 		# libraries with libstdc++ clang, and the other way around.
 		mycmakeargs+=(
 			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
 		)
 	fi
 
diff --git a/sys-devel/llvm/llvm-11.0.1.9999.ebuild b/sys-devel/llvm/llvm-11.0.1.9999.ebuild
index 9c6edd92398f..40ecd173e2da 100644
--- a/sys-devel/llvm/llvm-11.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.1.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
@@ -376,6 +376,7 @@ multilib_src_configure() {
 		# libraries with libstdc++ clang, and the other way around.
 		mycmakeargs+=(
 			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
 		)
 	fi
 
diff --git a/sys-devel/llvm/llvm-11.0.1_rc1.ebuild b/sys-devel/llvm/llvm-11.0.1_rc1.ebuild
index 9c6edd92398f..40ecd173e2da 100644
--- a/sys-devel/llvm/llvm-11.0.1_rc1.ebuild
+++ b/sys-devel/llvm/llvm-11.0.1_rc1.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
@@ -376,6 +376,7 @@ multilib_src_configure() {
 		# libraries with libstdc++ clang, and the other way around.
 		mycmakeargs+=(
 			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
 		)
 	fi
 
diff --git a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
index 9c6edd92398f..40ecd173e2da 100644
--- a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
+++ b/sys-devel/llvm/llvm-11.0.1_rc2.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
@@ -376,6 +376,7 @@ multilib_src_configure() {
 		# libraries with libstdc++ clang, and the other way around.
 		mycmakeargs+=(
 			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
 		)
 	fi
 
diff --git a/sys-devel/llvm/llvm-12.0.0.9999.ebuild b/sys-devel/llvm/llvm-12.0.0.9999.ebuild
index 610b92aa0fb2..d51ccdbab14b 100644
--- a/sys-devel/llvm/llvm-12.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-12.0.0.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
@@ -380,6 +380,7 @@ multilib_src_configure() {
 		# libraries with libstdc++ clang, and the other way around.
 		mycmakeargs+=(
 			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
 		)
 	fi
 
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index e9de66578f2f..0dc4bc52d2cb 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 1586 BLAKE2B 07642ef64396d1ed2d8f6cdf9d1c6e78f4cddb994880030d2e5843530e3f38b296072d3b294a393e9f6db6d24aa917179efb98128d7ad3bfd73f323c15e4d20a SHA512 4bd7e1038eda30a2b666771cd0267c14b3413104b6432d553000a21132fb4b6f3f75391201c2528120fdc8d9fa8b6ec64939c30d179d8a8dbd00bdb7d73154d5
-EBUILD m4-1.4.18-r1.ebuild 1398 BLAKE2B 8a3d5bbb9d5be18cb90dc16fc2e03ce7d0656f7f4003f16f453c748e5c71989c6d50ea09b4f931a39824e480ee8c27ff887b936137de31acde0b7961197f672d SHA512 c77857d42c856ddfd0887c6159e9cdc80f97817c0eef8f90d0de195bda1017dc3c01b09e7770ed2d5ba04c69cefe1f4f04f221e28356f4828f6755a10cdad8da
+EBUILD m4-1.4.17.ebuild 1566 BLAKE2B 84865a9044f215ab129e4786ddf5418cce90ca1ddb864803800be0bdb2b0557e17a4c0612d460bb09fd278b57f2651e8b5a3d6745b1f66e41fab38285b85232b SHA512 6f5d60f4a8fbec8af69c3d3fa1380e9c9f1c2cf8451e35474eaf9cff505ff74aff23fa4a61bdbbaf400caf6721616e73261a36cd11bfb2c6cd0e3b3f78b963fc
+EBUILD m4-1.4.18-r1.ebuild 1378 BLAKE2B 13a03b05467a6a05fd33027f1d1c38fa3a58b35b1840bab184076e68513c1ac74ed1f50cca301973521e4146d81489d4a3867dad8e97122851335a5c5ee49369 SHA512 700af9028c1b6bc66a79021f790d7fc4e61e392f7a344095a3b6e1254d3d4de60d86881c2305489ce6f41c3cd36c925c0413b1fdc3491b4c4819b16671e19c82
 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 28e289064f38..80431a260655 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 40f55c0a27bb..5c37b4fe7d96 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index e888b728769b..1a7fd20f0d4b 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 1689 BLAKE2B d90f4430b958d6d34f307847d3eac7f7ff6f2012963bbc78c07c0f51d04e85552b9fdd18d58f994275aee3192ccdc37e3db3cac081a8a4e2765c459ffbeab32b SHA512 8fe65ba4f107d4d1ad030567f257233837f961697c64556cd02511a26382ea28975f95aa6ce1f25f75628455000a17a3e3de642f59394038529127c63b8b1e2d
-EBUILD make-4.3.ebuild 1444 BLAKE2B 08f6c824591e5688575a8d81b710751a03eaf95eaf1a2eb99c1c3ee4bdb78a07f40dbf3508474ac26d8ac4cd93a8b1a54cfd7914db9bc8167d939275674f8272 SHA512 bb6304dedbb84b6a811be7688d23c5c53df1ebde06e3ee3fb9125432e881bd02aa06498c0030318400c366da1762167599078cdc5ced3aacb24c34d73b487a50
+EBUILD make-4.2.1-r4.ebuild 1669 BLAKE2B 6c483d3b2681a61c8c4584df13f3a01eef5667a18d9a24cfef79ae7f13d8579e0311bd22360fdec9156059fb0c784daf5645a0fa82c74cc8d4c6305fe947c595 SHA512 3625359337503366baee69e91ade9f7ca9108fae0f2f170a81a5bb0a95eb94d11b4f7b498f36f88cec0dd8bcdd517d9c2aeb218ab2f146b2c45ae46352ddd944
+EBUILD make-4.3.ebuild 1423 BLAKE2B 93ef31cb59849f6f5359f685a5a25acd5c45ac3a2b622ed43f575c9b952261b1319d8f96ad1eb338ee3492317b72852b0d6c7a8f1ce76d69651d3c4e98c61d15 SHA512 59e44117be3450b9abd5f05e908430b8b861e3f89ea51b95ee4fac529ccab7fbebc49173764d962dd90999492eae7f8a0b349f38f2ae980f49d31efb8cbf2929
 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 75ab98a32a74..e285a6b2b947 100644
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 2117d8090eab..82ec364fbba7 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/sys-devel/native-cctools/Manifest b/sys-devel/native-cctools/Manifest
index 6f7595f5ac55..5616ad9f08cb 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 2809 BLAKE2B 45a4b4ecbfcea0678290f3c1cbd978e10d0591356ff91c61d73cb44b68bd799d36246817e2cd8c433f52d9e040e3099c4d2797671a339a127d3fc6f58359979b SHA512 b26b2f8e11810f2a4d18758db79109f604b229eaccc8a95774c959eead0d340cbb10eeac66d561363aa8d602ea470c81d5db303d143822041703500a3c2fb879
-EBUILD native-cctools-5.ebuild 2999 BLAKE2B fba1610df5b8dd63dadd1f02e7fafb0b8bc097751c0efa2219f154bbad1de2cad137e546e723fcbfb48b624b8aa4c22c0fff779d14b51f7d9e55470876395ff9 SHA512 718d7731e0c859f37d1b3785fecbd73d5013cb39d89c2f1deef2abe14ce7fa2ccc14d42caffd2750cc957ed2946f41b9a23fede803db0466d689b683f3eae867
+EBUILD native-cctools-4.ebuild 2797 BLAKE2B 811aed79772b90a4b4c4cdc187496cf7066dc23aeee9bf2409c939c9bff7dc6bda6064b6c9ba12fa0caabb9dd3b197e0dcb0345b6df2bc24904a19b6d6e6100d SHA512 d25198ec930da3cbc2437d88a682e08155e38597bf356b32dc4a4f6bf5cfb2b0dcf5b3af3041ca42751f75d5e6361f9974b6dceb923ecbc510a42798fee9b381
+EBUILD native-cctools-5.ebuild 2990 BLAKE2B 664d77ef17ee7ae16381ba5c6bf87ab2131d01cf8bbf2f3f8c59f1eb593932aba33cf093099d71e6b1fce343f25b320290a958f1b81d6d4a167d6a581228ebba SHA512 71023b29c2b973c7d47734b07586f53ff466cc57e8c11824abb84e164ac14ad0d204606de169ba301f7a77a46fd6a79eaaa12f7fe84ba938c0b46d1d9a91bdde
 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 c05aee16d1b5..3072575483dd 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-2017 Gentoo Foundation
+# Copyright 1999-2020 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-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-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 d548ec568b42..0187a4d1380c 100644
--- a/sys-devel/native-cctools/native-cctools-5.ebuild
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 0950c0b27342..6b5b498f9605 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 1684 BLAKE2B 2bc38fd69ca9525f939fa4352dc44f09487bdf4d4aec90fb50e978f505f6fcf95aa34739377c4ec2188120eefa0079307b43a58c36dc91ce82558d9558898b9d SHA512 c5d29230e90aea8e841867291fd8c02b4a6cdee2cd408be4941bb95cdd909a30780c1f70a1992e92fc06e81cd7ae5cb8adf799ce8b7552f51427ececaba45a46
+EBUILD patch-2.7.6-r4.ebuild 1664 BLAKE2B e462e290b39e275207eee5a28e25522c16897e7705a365b2dbbc52a2b2ee82b90b1f207846d4531146d59a56fd521750b2250ad4d0a3066738d19bcb609d201e SHA512 492dce517998c53a314c854ac3658b57c90bbfad9299b67f945ef16112d2ea5b767af4fe11f07c7c5e763cd662e8a140a28f6bf99b6c69135130b6a140a5ca62
 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 9f407fde9ed1..be2b3d2052c6 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index 174af9cb0f30..e872845ddf17 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,4 +1,5 @@
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
+AUX remake-4.2.1.1.4-fno-common.patch 3096 BLAKE2B ca1fb0cd2382d1507239135f0aa2fe4c0d02414abd5c008a89ddae68d65589a8fc7244acfb7cf4881b3a44754208fbf05e54c8da2bc7317213b4bfa6ea4d4cfe SHA512 0d0751958e466bb2c40bff5b58d08a105e8b9c6884c02c05d93309f6014371f4ab0e2a3c38dd10cd73ecb3143076828d770031ea6c9aee63f945c15aa85774f3
 DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1
-EBUILD remake-4.2.1.1.4-r1.ebuild 922 BLAKE2B 8ab9739649111df005ed43060f46fc58788bb420861405f271cd9a81cd4c3508abb6175f314cbab9db184659f6499f1946915a5bdc27f4529dbf33cf64c2314f SHA512 fd5b4d212289a0dfff25967955a31e973fbf4cb013e8981da032c880ab3381b6770549540312feeaf4d10df4e621ca8a02d546f344a23de9d124fb2a0fc29508
+EBUILD remake-4.2.1.1.4-r1.ebuild 959 BLAKE2B 483247fef4339d53a5ef98d4d5529930204106bfd49ea2e293d31df4ad45ad21999d3b3ec05bddd8b02f438267c52bcf313e4fb11a6c72d0a4ffd646ab6bc792 SHA512 406017f4e2136046ffcea1b102652a28fb01bc895cdf749e19fea61d0d1b09824018bb10d8f050d9bd9cb8c09f4dd0e6a82cd5be60d520343cedaf7a84b7e21b
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch
new file mode 100644
index 000000000000..4367bf9332b3
--- /dev/null
+++ b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch
@@ -0,0 +1,127 @@
+--- a/dep.h
++++ b/dep.h
+@@ -134,7 +134,7 @@
+ struct goaldep *read_all_makefiles (const char **makefiles);
+ 
+ /*! The chain of makefiles read by read_makefile.  */
+-struct goaldep *read_makefiles;
++extern struct goaldep *read_makefiles;
+ 
+ void eval_buffer (char *buffer, const gmk_floc *floc);
+ enum update_status update_goal_chain (struct goaldep *goals);
+--- a/globals.c
++++ b/globals.c
+@@ -120,8 +120,6 @@
+    of each job stay together.  */
+ int output_sync = OUTPUT_SYNC_NONE;
+ 
+-const char *default_shell;
+-
+ char *remote_description = 0;
+ 
+ /* Remember the original value of the SHELL variable, from the environment.  */
+--- a/globals.h
++++ b/globals.h
+@@ -85,6 +85,12 @@
+ extern bool b_debugger_preread;
+ 
+ /* Remember the original value of the SHELL variable, from the environment.  */
+-struct variable shell_var;
++extern struct variable shell_var;
++
++/**! The default value of SHELL and the shell that is used when issuing
++   commands on targets.
++*/
++extern const char *default_shell;
++
+ 
+ #endif /*GLOBALS_H*/
+--- a/main.c
++++ b/main.c
+@@ -40,6 +40,8 @@
+ # include <fcntl.h>
+ #endif
+ 
++struct goaldep *read_makefiles;
++
+ extern void initialize_stopchar_map ();
+ 
+ #if defined HAVE_WAITPID || defined HAVE_WAIT3
+--- a/main.h
++++ b/main.h
+@@ -35,10 +35,5 @@
+ /* is default_shell unixy? */
+ extern int unixy_shell;
+ 
+-/**! The default value of SHELL and the shell that is used when issuing
+-   commands on targets.
+-*/
+-extern char *default_shell;
+-
+ /*! Print version information. */
+ extern void print_version (void);
+--- a/make.h
++++ b/make.h
+@@ -333,7 +333,7 @@
+ #endif
+ #ifdef SET_STACK_SIZE
+ # include <sys/resource.h>
+-struct rlimit stack_limit;
++extern struct rlimit stack_limit;
+ #endif
+ 
+ /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use
+--- a/print.h
++++ b/print.h
+@@ -39,7 +39,7 @@
+ 
+ /* Think of the below not as an enumeration but as #defines done in a
+    way that we'll be able to use the value in a gdb. */
+-enum debug_print_enums_e {
++extern enum debug_print_enums_e {
+   MAX_STACK_SHOW = 1000,
+ } debug_print_enums1;
+ 
+--- a/variable.c
++++ b/variable.c
+@@ -29,6 +29,7 @@
+ #endif
+ #include "hash.h"
+ #include "main.h"
++#include "globals.h"
+ 
+ /* Incremented every time we add or remove a global variable.  */
+ static unsigned long variable_changenum;
+--- a/variable.h
++++ b/variable.h
+@@ -115,7 +115,6 @@
+ extern char *variable_buffer;
+ extern struct variable_set_list *current_variable_set_list;
+ extern struct variable *default_goal_var;
+-extern struct variable shell_var;
+ 
+ /* expand.c */
+ char *variable_buffer_output (char *ptr, const char *string, unsigned int length);
+--- a/debugger/file2line.h
++++ b/debugger/file2line.h
+@@ -19,7 +19,7 @@
+ Boston, MA 02111-1307, USA.  */
+ #ifndef REMAKE_FILE2LINE
+ #define REMAKE_FILE2LINE
+-struct hash_table file2lines;
++extern struct hash_table file2lines;
+ 
+ typedef enum {
+   F2L_TARGET,
+--- a/debugger/file2line.c
++++ b/debugger/file2line.c
+@@ -26,6 +26,8 @@
+ #include "../rule.h"
+ #include "./file2line.h"
+ 
++struct hash_table file2lines;
++
+ unsigned long
+ file2lines_hash_1 (const void *key)
+ {
+
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
index 16971ea81794..447b79c7375e 100644
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/make-4.2.1-glob-v2.patch"
+	"${FILESDIR}"/make-4.2.1-glob-v2.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /sys-devel
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)