gentoo resync : 25.08.2020

20 files changed, 36 insertions, 190 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 10011f952acb..410c7957df50 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,8 +4,6 @@ AUX 3.4.3/libffi-without-libgcj.patch 1658 BLAKE2B d1f14ae4d15ad7c70884afa88d9e6
 AUX 3.4.4/gcc-3.4.4-cross-compile.patch 1912 BLAKE2B d05065e69610e10ced5ad67a2cbdd3c79d84b94f3318bb5b69253102b2e38c08c8d33e15ca3883c2d36b1623d7d362cee1cca0edd6df3539acfc02d7541401cf SHA512 c31cc4c77bb9a5f01a7a7969dad862fc5d7f9916adf67e039a71714e0eca02b13a576bdfbab50c069cc8020ef4dc335ed20bb10214f714a089b8daa02e849d2c
 AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 BLAKE2B 945e234afcbbf2b5d737d7a4b9fb9282070ece739e1e487723baf9aa4e7c0777ec7b43cdd4957c89b9fc42c15eb2aff0564b370dd6b3e1a3849bf32680c69bd1 SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20
 AUX 4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch 1686 BLAKE2B 32053b87fd356274daf10dfc12ed04f6291cf948a3acea0200d05150b31e9244d17971f2faa100753aa5341a4e19a771e76c091e3f0eed4e64a07623aa357c48 SHA512 cb0268c64d8d50ee3c95e9c6ca9242be1cb08382c7b081c129045a4852a7b3ed5c48124b33aa51816d80f5c930929bdc097644e817d77b5e186442248a609f2f
-AUX c89 412 BLAKE2B 04236b6a32e8819c65713821e769d5bf55f194fb6bdaa61c48ad09c7e13e123d3e4725394b3a922445efaa951849f4e87f96e34a55d3e229dbedc50ca1816f44 SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924
-AUX c99 446 BLAKE2B 061fcbef85149de611c4692c99c2c5ebeeef045637b999dbea0d1922398e16361cedbd461ed6aaf0c49c6269900a4c346f5026d8c22780044e1cc8afee74be4e SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989
 AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec311961c07b62f470d77f1de125fdf81cab6f884f08dfd8b957b7c2880ad04a7400f3fb395f5404d6c467373042e2fb0c SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b
 AUX gcc-9.2.0-neg-insn-cost.patch 728 BLAKE2B 31b393a42b5d54de07a43cc6e43dc9d7228905ceaf27f7541cad4baf4d1f475dfbf0b6c00e76e5cddaea382fb77909166843f16d2a76b07b9c42bb0e181b5781 SHA512 057c8fb003df37dd15bbfc7f9e87e07d8a1cdd67885f8efffb80aaa694cc9314bb7317b43e57be55d55b3dc58a29bde138b07738a2a0d6cb8454b270e1c88983
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
@@ -13,49 +11,37 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
 AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118
-DIST gcc-10.1.0-patches-2.tar.bz2 15808 BLAKE2B 8275c2ac3eda8e87255fefe2bb4ed2a10d790bf6085517cd26589fa6a98aa417f4578da88da91b4639d78ed9c897a07447d2048698b4e003f3adc397881c7ee5 SHA512 f3ef55103346a0ca40a5633a520091e93e98a3226d24a2b677f791af511460ea5bb5f6dbda6cdf706af2aeb22eb39d37cf226e012bd378c330db17246da88d09
-DIST gcc-10.1.0-patches-3.tar.bz2 19498 BLAKE2B b6de36dad6ce313d8dc81eed1e7e4ee7767ec321cb22341e91cd1478667990706136b7f458b4644316f6701812d16f96a71240af0adca355da8276e53be1573b SHA512 181f13442545a5498da034e3e5c9a95e1bfeae0af6fefc8d823b36658537b1b0516b041a2e441375729e3eb3afa1592cf83b6fc767f17a3b139d024346832e52
-DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096
-DIST gcc-11.0.0-patches-2.tar.bz2 13521 BLAKE2B 4c5c62615ec98c9877e019d07a6d05c6602517fe4f639a142d8212dd47fd3a7e87b071ba6b615b7e9d5f9f07c2ae3787749028c42a61be9bcdc61c4f0c059580 SHA512 c5730f5f14702d6261d3ca4f192b4a18688573d9e696a71f4bb4ac39acc7106059d8a4835a035415829fa6d3fdfb5ba95188e4a0a2509408f18d86f2527fa94b
+DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4
+DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
+DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
+DIST gcc-11.0.0-patches-3.tar.bz2 13329 BLAKE2B 2572605b14221412805d6a5b5e7d237eb2d547afbac0b8590d599b14042151d987d56bc1c702f38b9f05d38e3c08b7e842b6b154c5cfa378a423ff7998ff10d3 SHA512 4cf5168368f56a723c9d24c17ffb9931bbbce4fad04671705f3fdd3bc85a21447a7ead06d6ab32f2d27ad1733507f52d92e9ee5a1d8fa8a23e89e1457aea4226
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937
-DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
+DIST gcc-4.9.4-patches-3.tar.bz2 27908 BLAKE2B d3dd297df864e2240e4b80b8c81266ae9a6c3acf97111a2a682c5e12df99719c57810f677ae9e8a6177c685aada7cc4cf48a2b493f3202a37cd3f36e96e3319c SHA512 8f2058b7effa8bbf5cbafd474a045763274d9cd70a381f3b163e06c3db7495a458565a94f63e8afe7640006986e787bdfcf2b36d1e3c8f4364969aaf6bc5eff3
+DIST gcc-4.9.4-piepatches-v2.tar.bz2 14237 BLAKE2B 60afc2b8f78838a5f444819401d79a3a48ad0ee2ddd09bf32da1b06dcc6f933be61951f7c6b53d8224319a5d42c6b79b299bc06930eea1ca31301a1bb0b88513 SHA512 fdca8ccc81bed856c4a2e0da7a8cf897ca9765f9b448595bbf0d5a93702d91cbf937b560ebff96e3cd820b7747dc60a6a490d78adbacca751ecc7351ada2c56d
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
-DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057
+DIST gcc-5.5.0-patches-4.tar.bz2 31676 BLAKE2B 9fef84a494dc19668f1118733712fcd6bb17725ccb8381ce7906233d2beebaeb6ef579e6ee7e0903c19d50edbce642b861a26a69c8d26c00b7ede2f558d9965a SHA512 5fade4c71ae5c51ae320da267ca3e79f08316e6545776b80a01f4a8d762880953d17ca7afb6319076cad83f90f5b1b6cc7889d2a2968c6a7feb5946d69a1fa15
 DIST gcc-5.5.0-piepatches-v1.tar.bz2 14367 BLAKE2B ce1d288ca4d563cb12e2795dbc9f9c674e451295c75fb4b15b9ba65d3efc8dacea725775cca8c67b581647235b692dd4083e8b158f87c7951bbf6303d8efed43 SHA512 6baf18a7ac6cdc1f93a1a8f87bbbdcc96c68d2b256e82ce04beabdd4ad82b2260e04dbff0850da703fb94bb1f9e13439d2922d7aaae3b12eaa92bc53a89a9398
 DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
-DIST gcc-6.5.0-patches-3.tar.bz2 10882 BLAKE2B d4eaf97c7d531bd02442b8eea2a8537436681d01a4fe225ab4fd31863c174ee76fa9443c083bb85d51743c7d3e6e6791cf94390cdcc80f5d05179f90074b0346 SHA512 e99586b142cce71aca0843543a195753a27872c9b49ca841c8b3525d8a010d8e6793dc4800d9acd89c7f63c57635e630a2db2f25b33f9690af4a1eff1aebd9eb
 DIST gcc-6.5.0-patches-4.tar.bz2 12270 BLAKE2B fe985ac4d232b3e237c99d9441ba8fa1ab8e1f223ef93e93580f53fcc54c874d7ce3b1dc0041a9ddbf540f532f32b2ced95c50f412a466c49a7b78fda8d5be0f SHA512 5c51dddbe6787b968bbe358ca6e5d3a18203d2fe59fceae636b820e757b9b91afe52b569d7ef1734077151e1c3f70744cd51f3c840bc050ce41685a345f5cd36
+DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
-DIST gcc-7.5.0-patches-2.tar.bz2 10573 BLAKE2B 7f631174fe317d97d92cbad7dd18285eb1596333ff2dfad346fea0d76a00fbcbd78b4c296f863854772c9ed3ce23ca9fd41c23d02e172d4dbbf23bd1f803bb4f SHA512 1f53b320acd813e97bb37b3165f6f2e37259d551e0ee49df08056c0b17a7e4a02b3a764e56d97a37c4cb71302ab5fe55b82f0b96c1adf5fa8b71016cab4fc0b9
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
-DIST gcc-8.4.0-patches-1.tar.bz2 14854 BLAKE2B 055ac27224a100c9678b343fe85e3431d4553780716ac2a9cdfa1e5bcd7b5073b883cefa460dbab8b34ffd8d19dadab0e66cebf9ee51a89a8a2d212268450248 SHA512 aaf44c0ccbd99690cea9cd4452bae8d4d6bff98ba591b29d50a50c19f3221c24e923441a24392f9717f541aa4e097645756fdf0ff558b7a263ef21d7d1e334eb
 DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
-DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
-DIST gcc-9.2.0-patches-6.tar.bz2 23171 BLAKE2B 00295f471a276764daf003c0eb6351d6d4e7e247df2519b4fc6bf360d72ba10af1230ca0175cbd96ab4beaf0123b5061c7c2f7f5c0b95b7f416a735ad9ff454d SHA512 8a8a070a66a24f31ec2d3d1cf170db2d030a1667485064646d360c3154330f01e7b44595642040c07d033922f1654c4b18bbabfe269210b3d1aeb24fe248b613
-DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
-DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD gcc-10.1.0-r1.ebuild 290 BLAKE2B ad03863f65f96bfe59e86e10189ae666155341d4947d5043277d21c0021f1a879144b409e02ba7828f666dbe350612217298da45143ad1860ed4ef04e06645c9 SHA512 8c4561450bf7c416df2fcd0844c2e28b28172a948c2327c7680b6c5968d113dbb09a30be6e20168a3411140b2124e247f4ad22a5996668fb1098322fab3a2309
-EBUILD gcc-10.1.0-r2.ebuild 290 BLAKE2B 3276b1652d29a04d31e4e6984c732f648ef0da790cbc2695f63d094705d4abc7119743cf063933feb6eba7c6a6fe1834475a6bf4f282e75c15d81a8fe283cb7e SHA512 d48d6aa664c0f78ee6f5f363e65da69220835fe78704a4dcd44b43fea14a6827f8aecdb1bdec7decc20c15734b974f68df7218af4b58b61134690dd651fd77ed
-EBUILD gcc-10.1.1_pre9999.ebuild 405 BLAKE2B acdd045129f65fba03a33cc6ea25c429dbc768264d1841445daa6715780f27ad8776199bb3c0c52287f3a70b6ce077a5d13f43aee3a0315106f0a3516bc03b78 SHA512 c0691849f15e7671654f00c663890e7189fa0d1694a53c3f5289a7325427ed31910ff175556578c4e5180fa8d5049973be0aada659d8ee8823db71f63772942e
-EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B 293d755306b4958352fe344c58f303432169fe06b2ca9f0548a84f43311bde7d51e4507f01547c500e3797c977aaed115976f3d17f43b14cc7885642c777f795 SHA512 3c42d9eb4194b5f35180ae818c9cefcdf65bc0a3b4e3b872ce7da757e0d470be9eccf0d383ee88fbb6a68ed33c48e23eae5f5280bdbaa27361d411d67cb8e49c
-EBUILD gcc-4.9.4-r1.ebuild 1442 BLAKE2B 89d982040aeeb513b50baaae4863edf3d8419536f09e4a44d327d0bbd342c528897209ff036a99ba3fda2c75cd36931ee8f413e273e86045cafd22c5cbd8957c SHA512 156e51cc3fee5404c97e04cb8eb96ef86b885bd4c82d3cf225075fe1f94cbed11840d394bdedfadd3e1ba4396e72a312892faf5e90b5f1d94e780801f590dfdb
-EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 061928d67216aac304cfb6bb02f65b2ff04ee8139a005f0989ebfe75460af572b9bf997bdcdd3604267190db8b31b5d9512e4dd96c3fe92c7aa923d0dfa8ee37 SHA512 e9b20d919ea32363f5d0314ab59708403256d3a7178f41562f39cf15d223ce8fc96bab060fb10390720a244b87bced2dd0570f5e31059245d4c452050bc057c8
-EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B bdd1de3a0facba6f1ee9b0e7c8717920d0df66beb44b1b24a85f65476326e8a812d9dace2ca65e5df89fc2a94caf9c03b35fe83d6c18054e82ee751455a84906 SHA512 4990258b95bd948b1891b7265bac5bbfd5feaf1bb534596ad4c779a871dc5156db0c3286ec8396eeb0991ba5462a78a02d6bee9024967e375b23bc499bcaa3aa
-EBUILD gcc-6.5.0-r2.ebuild 445 BLAKE2B a92e1cd9bd26d14390e4f9adb5e511ce5b613f9820527283a14917004f9bee594b80ad1e263d33d2b8390ad991e9d35133ca035532d827775f88128edda3ee06 SHA512 6ee49027d92fb55534c68ecfd48db30a6b19724cfe14404d186472cf8d227fa14ec76584b44f2a05eeab263550ea217af00f2f4b89b32881de5e36b2d730c7a5
-EBUILD gcc-7.5.0-r1.ebuild 456 BLAKE2B bad9ccb3415eae7e4f793fcda356b076556c62475d74e25d8133d1ac7b8f8c35394f999ccc1ed24330ea9eea454c61e953704f6dccc92edcf483bf967b3fe0cd SHA512 9ab3740bd4f074db8b96c06d45cedfa05719d5e832ed47c170733d7569b90966617efdf4c5bc7c2ec325dca9618d285f27c9f1e30a22479d7e763f4db735d7cf
-EBUILD gcc-7.5.0.ebuild 447 BLAKE2B e9c72e8743ec650fd79244b81e7855bcd1ff1b4a13d8fe245f92e0ae2fd37c15609aa951429afcd2eecd4ac2d3f45786e5e2d8a72fac439aaf7cd7a525f3c4e9 SHA512 3b0e22f868d6ff1ec47b21196354873da4d01f21350aea79d1a86c218d4245237a9e5462ae3cb5486ba48736edf6fd1550729a0b49fb22cd87d0f4d99c4eb68d
-EBUILD gcc-8.4.0-r1.ebuild 452 BLAKE2B 0896974e52aeced6004b4bab01fea077803a8e92a0df45f1cd9df3bca0bc19bb1502ab764526749252888b0cc9a67ba2ef09ec07589768ba6d65390502a751fe SHA512 0016848b01a437b8d5e40e115fbab8311b525b41bab46b5c3eb47727abaf4d8b26828293407533792fc9aefd931af9b0dcd56c8853b5e9708081e62789e6ee6b
-EBUILD gcc-8.4.0.ebuild 443 BLAKE2B 0b37d1fa2fd83c95142b122a0fcc4bcd01f8278c80397f3aaffb0943af6578952a242de8fe0312b3c4c4d533f5fdebdcc63b67b29b17a6fc67b5b052f71cdf25 SHA512 c03adf50767371fef49b800bd0bd364eecf42e3e90033727bfecbd862757c43f1010f9230730506d09bbc96c747cb015fa7aa6342c5d475a3310a129cf0ec5f3
-EBUILD gcc-9.2.0-r2.ebuild 539 BLAKE2B d48f3dd9a33734a1db5546b6223bbb68ddb1f5831c92aa435fe6536af843f3754a688e728055b56999dd836a82e2bbc0f7dd9a4644d66d1c64ab127bba1af3a3 SHA512 a0b565c5a9c54f419c572a760f9b0b310e7008ca0d701a890bee224f7491c265e978215714d12a9565f4924f37c389bfd7fb1512d43e325e715d40ad3ec85f38
-EBUILD gcc-9.2.0-r4.ebuild 452 BLAKE2B 5b1ced4bebbe5558068cde5d495e04a978292cdccb118f199642484a6cb4fdde844c31fcd99347271addaafa7c23e6d8dbbd13d1d54a08bbe9fbc470566817d3 SHA512 65ae72ce9e55b2c8a86375ffe8188d9e05fd82a077d8b5abac5b5971f152efb7610fce553af12f1746ec6f6bcf881fafe3db76a5098d99c9e56fdd3cc3091096
-EBUILD gcc-9.3.0-r1.ebuild 452 BLAKE2B a08af9f8f55166a07894145a6d53a4c6988b9a419e95386e28f6875d6a81a6a02db25a051506c981e17c68846056a919697cad6f5ee3461b4f3167777974921d SHA512 1991ba970e5e56eda9a8e1391514de8028ed6741b379375d23ae3e13f267203cdd29ac0aee9f8faf8dc6a42c0291095521257886c77bea64159665f0ebb00c1a
-EBUILD gcc-9.3.0.ebuild 444 BLAKE2B ea6cd0618f8e9a9de4b6e52e9597bb41427ab6b763eb52efbe99cabe02584d33e920fe4563cc1a85b47241ede3c24b0839dac8036f5868d47104cbe91ffeb2a8 SHA512 a238831c8db63c73c5edbd19121652cb0165220546811c9a2c82f08df54a1b1a6413592e5cc5d9d24ea771121721673881aae9a03f7757d95484c300b8fe78e8
-MISC metadata.xml 2741 BLAKE2B 0d133f98159b4fb6aef4c9817e7f8a0fdd5b0b5b2455a8adf6285e2670495a613a5c1ecb7b88dff642d6b640bbcb97c3295604fa07e220ac6cc0764c0770a39d SHA512 b74707c77eabf279fbaad6fbf6d1c9950beb7c36aa06bf4b188360c12921fc85597cd42c95b3cad78b021207ffa0e70453b3d12f1305408dd308ce72b8a4e269
+EBUILD gcc-10.2.0-r1.ebuild 290 BLAKE2B ad03863f65f96bfe59e86e10189ae666155341d4947d5043277d21c0021f1a879144b409e02ba7828f666dbe350612217298da45143ad1860ed4ef04e06645c9 SHA512 8c4561450bf7c416df2fcd0844c2e28b28172a948c2327c7680b6c5968d113dbb09a30be6e20168a3411140b2124e247f4ad22a5996668fb1098322fab3a2309
+EBUILD gcc-10.2.0.ebuild 290 BLAKE2B 02d5ac3a657382fa7a1146e5d504ddd4d3ab4caf55f6e4f114a3e5bae01a41055e8ee7421a7aaa241ceff332fafa44c1bebc5bfc77960ea27f204b4b9c467e18 SHA512 e95b6d2bfb0f1297c7bc2a7f2b2cc36a638b60f2aa66dbcd499d86d2e9c9e4e85e4927fadde94a80cc7cc4a1874bf03d4dc6fd2f770953d9cca2ad25afdcdaa5
+EBUILD gcc-10.2.1_pre9999.ebuild 405 BLAKE2B beae0b515345d9a5f9f8a54883b3bb9d218d2a17a706b06e651cb30ca1566fb429990deeec9a6e2dda91f9541306bb1c83e1b79316f0239715e0a244b3a3f3bf SHA512 cf28791a46432be4f633316d75aad68dcf130ab84a0c163bf538dcb698ccfbf852df87cb222e1f7db7902a1f2d9292312e536fc733f7b042182ee413fe52479b
+EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B ea191a89a56082a98442ca6bf3de6b0517361c16614745e8731dedebea77fa1745a45728f69f491bd5eefc0ebc9743750d3455c6f9cd0a55f8c5dc618d33bc7d SHA512 3e0155eb9579c37299ed77bc045dfd2f1a91a38c7c02de5e2d0c821e430489396611cddb80bce7fa8310b01a72e727d23d316018af2c5576d002a81018f6b5f9
+EBUILD gcc-4.9.4-r1.ebuild 1438 BLAKE2B 0cd42c3a15b80146943fedbee5cccb05ae3832b53fe674a43c85a7f87fca6c1ebaa7097687281dafe2dad993da78ef5c1bfc6e3176559031ac9ac9ffae0fc7f7 SHA512 0ae3fdba2aa7f2525c28c4b2a2dcd7db973b3efde3e8467f24515739c36dcc858cd95cded2e3bdecee92e87ba5f06ac1405613c67bca7cf9be19caec2531c136
+EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 977028492445b2a30a9c2477cef241ec5fd08fc0b7334d5b0f16d8ca8aaf90288bc336c5961760477ddca362db423b5d7481380c8b62ce068cc6c6d34aa1a642 SHA512 acfb8e42fe2748a30ef96d9a11785c266361d37a5348601f627ca4e942a98f3b797eebc92aca430352aa9d9f3cd65b208d5e8a8c0dc91e2471462638ad69e351
+EBUILD gcc-6.5.0-r2.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2
+EBUILD gcc-6.5.0-r3.ebuild 440 BLAKE2B 44856f0eee55921a65648bf49af7a3202ea0ae1bbc6ad21c583d0b4b44e9460d1efbc9c6a6a1cc0acfda618ffae2a27440019423cd5e67b105fee525fcef25e7 SHA512 16b1dda9439db496dc155aeb5304a686ee8696ba89c7b870bb8dc9eb6b26e540590d40915ee38040464226f1c8a599054580c9f33c941e7f597da301b95ab9a9
+EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
+EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
+EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
+MISC metadata.xml 2848 BLAKE2B c1c7a91c7a636c4478cdc43daa110d0a3e5830ac632ac6ebfc3867a66f1efdad13d4efe69e91ba3fa1cf26b5dc774926a86e2d8fce933b45c11396d30776e005 SHA512 a7be1673fbae0972c7c9937b6de533f5263d7796e413a2055196c722a2d1f6a79f2b8730f7d7fde5264e4b924f497453efecec09fccf8b7a037c7aa4c54fda7a
diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
deleted file mode 100644
index cee0325f50f1..000000000000
--- a/sys-devel/gcc/files/c89
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-2.95):
-# 	-ansi
-# 	-std=c89
-# 	-std=iso9899:1990
-
-for i; do
-    case "$i" in
-	-ansi|-std=c89|-std=iso9899:1990)
-	    ;;
-	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"
diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
deleted file mode 100644
index c9542095e385..000000000000
--- a/sys-devel/gcc/files/c99
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-3.3):
-# 	-std=c99
-# 	-std=c9x
-# 	-std=iso9899:1999
-# 	-std=iso9899:199x
-
-for i; do
-    case "$i" in
-	-std=c9[9x]|-std=iso9899:199[9x])
-	    ;;
-	-ansi|-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}
diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild b/sys-devel/gcc/gcc-10.2.0-r1.ebuild
index 79c068077f23..79c068077f23 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0-r1.ebuild
diff --git a/sys-devel/gcc/gcc-10.1.0-r2.ebuild b/sys-devel/gcc/gcc-10.2.0.ebuild
index 18771f649b57..e41dc5822d49 100644
--- a/sys-devel/gcc/gcc-10.1.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="3"
+PATCH_VER="1"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
index ff3ea3509670..16a7ee805039 100644
--- a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_GCC_VER="10.2.0" # reuse subset of patches for latest for live ebuilds gcc
 PATCH_VER="1"
 
 inherit toolchain
diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index dc1d3048122e..f0fcb70cbab5 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_GCC_VER="11.0.0"
-PATCH_VER="2"
+PATCH_VER="3"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index 7580cc2b1b11..790cb126b299 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PATCH_VER="2"
+PATCH_VER="3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.6.4"
+PIE_VER="2"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
@@ -40,11 +40,11 @@ src_prepare() {
 	fi
 
 	# Bug 638056
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
+	eapply "${FILESDIR}/${P}-bootstrap.patch"
 
 	toolchain_src_prepare
 
 	use vanilla && return 0
 	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+	[[ ${CHOST} == ${CTARGET} ]] && eapply "${FILESDIR}"/gcc-spec-env-r1.patch
 }
diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index b3b32128d053..c7c547b38e50 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="3"
+PATCH_VER="4"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-6.5.0-r2.ebuild b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
index 79955645ce2b..d720fd6569b9 100644
--- a/sys-devel/gcc/gcc-6.5.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
index ceffa35a49ab..7d09b9ebd508 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="7"
 
-PATCH_VER="3"
+PATCH_VER="5"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
index 779dc5475441..2dbab112f4b6 100644
--- a/sys-devel/gcc/gcc-7.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0.ebuild b/sys-devel/gcc/gcc-7.5.0.ebuild
deleted file mode 100644
index 1e003b833a53..000000000000
--- a/sys-devel/gcc/gcc-7.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-8.4.0-r1.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
index 257d96bff95c..39a1e242e776 100644
--- a/sys-devel/gcc/gcc-8.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0.ebuild b/sys-devel/gcc/gcc-8.4.0.ebuild
deleted file mode 100644
index a34d9f09bd8d..000000000000
--- a/sys-devel/gcc/gcc-8.4.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="1"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
deleted file mode 100644
index c5aeb3e361f7..000000000000
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="3"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
-}
diff --git a/sys-devel/gcc/gcc-9.2.0-r4.ebuild b/sys-devel/gcc/gcc-9.2.0-r4.ebuild
deleted file mode 100644
index c5057f857b75..000000000000
--- a/sys-devel/gcc/gcc-9.2.0-r4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
index 576f5446974d..c08d53c6cb79 100644
--- a/sys-devel/gcc/gcc-9.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0.ebuild b/sys-devel/gcc/gcc-9.3.0.ebuild
deleted file mode 100644
index 1da6db9eb470..000000000000
--- a/sys-devel/gcc/gcc-9.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index a6c76c3bd108..feeacd303176 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -34,6 +34,7 @@
     <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
     <flag name="ssp">Build packages with stack smashing protector on by default</flag>
     <flag name="systemtap">enable systemtap static probe points</flag>
+    <flag name="valgrind">Enable valgrind annotations for gcc internals (useful for gcc debugging).</flag>
     <flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag>
   </use>
   <upstream>