gentoo resync : 25.08.2020

21 files changed, 159 insertions, 724 deletions

diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 036ec3c60796..ac4271e9accc 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -3,74 +3,42 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118
 DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096
-DIST gcc-4.1.2-patches-1.0.1.tar.bz2 43294 BLAKE2B e8040fb94925a622e5fffee820cb1094989210decab95175844ce729216a439b730381fa457e3a607f124c4b9d249427bfdd85fa9e62cb96199a911509c06736 SHA512 79f1d47d364462325a927b35b66bbdc68c100dbb6c86a6dd524d0e1cd09b7135c3789e80b71539cec63befbeea1a0e9b456b53ab0a5580b64509f78231d3fdc5
-DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
-DIST gcc-4.2.4-patches-1.0.tar.bz2 21809 BLAKE2B 5ae6eddeeb6f39fc6364f093d7ec166d053dce33d25d0f0d128dcdb95de6a203b993b60302b56bb347e76fbb50f932642e64ae0dadcc7d824600056e1e26432b SHA512 20eb3fa790e5cc1bd66c9ad1915c73c20ae8977d6789addaf4863184e6d5c25ab9b0f2c40e3ad08a6859825b2e97bf0839e0a616730362072aa35e8ae158a427
-DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
-DIST gcc-4.3.5-patches-1.1.tar.bz2 74719 BLAKE2B 1261b9888c585f87c8f0b9f0dd6a0b80922d357e6ebcccc75335468d2fca067e1b23596e558dc01331be86406ec7d8fa37fc39cc1c01f709a8c19627956f4e58 SHA512 9c0e13e1186259f3410bc1cccf198d4bd9f1a2fec7d121ca8dfa0a90312b40f4610d216c8012525440045b83347dc2e05ac3f1584a08a54e5d384c56563bf4e3
-DIST gcc-4.3.5.tar.bz2 59347925 BLAKE2B 41fe2fd7e8fb0dc528ce8401fb7fe7e6bd91a94e649c3c5a9a14f35992d90c957b4b0ac8f57e1fb13dc5eb789c77b145c6199cb533f3de2c9da298ef626c4528 SHA512 3c4074102b49c9783ecabb183f37741ff878ebc481c4e42661de913d1453fb72f074cfbfafacfb2d7fe6ea662da3c706855fc43afaca26de0c599b8121b60803
-DIST gcc-4.4.5-patches-1.2.tar.bz2 22319 BLAKE2B b9c504be63e826b29c183dd379a61eb26bf9e4bd331769ba13d26e6a6253c5bc8c7c360c299ae63f304cfb3f81c52145a2ae7425f3652f1f2a8b85ef21dfd393 SHA512 ea3d0ac7b6a31d32ecf94fdd27b210ad97136cb7a1544f748ba936cc70c2c3964162b67ddf581ebef7eb57dd495bc5058759f4240e2a27392359015a4c22e331
-DIST gcc-4.4.5.tar.bz2 63081552 BLAKE2B e11dcf028ed587c48e07116de22167f7b096f42cbb58e2c5d19fd3e44d24b9485859da4aaf61ebdd995a3341921cfba159473bfb2ab4f6b9de568f248b2586b4 SHA512 d98ed79b13b58dc2e83d988514bd9a4dfe0dd4c8538efdfbaf0ec1f58c0aa990c39f97699f43b32d09f6022aacda2552e226c82de8c7b816a15708537f32662e
-DIST gcc-4.4.6-patches-1.0.tar.bz2 25346 BLAKE2B e455e0f698e720263411fc65d0fe66e7ad400716447cc15a42de123d91128077b17794997b989e89d9950ff0932ba4096168553eb342587dc6cf2289c3585fc0 SHA512 3074afcd36f5d0ba4a2ae53d5742dd269c36284bfa345564bd0de7d95111b15b43e5c8f86ecd577257d769baca976d02dc2fc31e4f8c5bdca2b989efc92c009b
-DIST gcc-4.4.6.tar.bz2 63135296 BLAKE2B ef52596cdfe5664792b60a77ac347a10a2ae80942625b1b389cfc231722fa32bf2e32e7e255dccc20a214d84554d75f36a005aad1814273331523f721ecbbf08 SHA512 a4ecc77e227c523b65988ecc3db4243bd96794d7373a4c3e7c15b5c60944f204be1d8a045a964bbe5ce0bb6d6136c09336eff0059a1970c0404f5585bf8688d7
-DIST gcc-4.5.3-patches-1.4.tar.bz2 22869 BLAKE2B 4cb6318ab9fbdb47af59ed69e6c686c6d5d6d091a0ea7b4ff32699ad2b63a40f75345b400e702749d41cf7dbe8582ca9153e991fa581b19f9cfcf8b25f149718 SHA512 5361914ba7142a22c12f7f415840be1645a8e6531ee7310a4ef476537b3f81e71fe69a11ac51d6016b0599ab5eef06b024cdf47e03cc11a5e1e5b031a63e2851
-DIST gcc-4.5.3.tar.bz2 66374586 BLAKE2B 796b9fb429616cbf38bc519e60e053a8237ab3d343bc4b616e0eb640ee818e03ced26b2485064eae5adb094f2da070ecf9ee2f0f643bb59d0b00c3cfccb1ddbd SHA512 42c03aa0d16a52e95d1857d859ddd0a4923c232b90481ee52b02bc9a3976bc6e5e502e94af3fc76ac054572a420303c47e409c72f816416aeffd74c4bcd443d3
-DIST gcc-4.5.4-patches-1.2.tar.bz2 22588 BLAKE2B 3972ebefb0db04a9881b84f21eb255016d2306f9a5624279989a44e553d6b91ba6ddedd90caa9fb28c5c9f9a02c6c264f536d95f6b4358d604b0dd298b949366 SHA512 f69c7be5195d4151c3ed1d3fb2913a77bea871554b03f1149ce700bb4cf553edc795cafd637c75305af6ed4079ec698122cac7836ff0f06189f9687ee5565f99
-DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
-DIST gcc-4.6.4-patches-1.0.tar.bz2 18687 BLAKE2B d83ca7ca698334a4341411b1c5a6472938e0917176bbd1e66435bf7b7df8e2b48262d055056cf050161545edc44d87d66d58ff18bd4b94d8dbbcc181861c4bd2 SHA512 8dd580faa9bcffcdeb1843a8d3d3bd8db492891d855c17bba3cc019673d814a5d24a927055694307be6438cb2c041bc799646a483c019f3840e4e1ca33b7ccb5
-DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
-DIST gcc-4.7.3-patches-1.3.tar.bz2 42559 BLAKE2B 4ee36cc8b6280fea4cde257be2ef84e6a6c137c423b286c661c684c614495a8fc3a8ae8a3a3696550b7c67d251fe9931facfa9b5c600a818428fca55de9f4562 SHA512 3a962d5301aaaebdf18b49e4d603b1dfd13d1bc0e874d66f7d0840058dc4588cc081df0b1da05bc6e293cb76bdb7fef1f4e76261f1c15820c8008a4f9814fa13
-DIST gcc-4.7.3.tar.bz2 82904224 BLAKE2B 084a21a317de5ccddf480e429f95d13f6c0c3a0102c38692aff0283b280aaeaf874e602a12341418a100566159bb54a14a3deb0a9c8604388ea08aac9e484f93 SHA512 5671a2dd3b6ac0d23f305cb11a796aebd823c1462b873136b412e660966143f4e07439bd8926c1443b78442beb6ae370ef91d819ec615920294875b722b7b0bd
-DIST gcc-4.7.4-patches-1.0.tar.bz2 40785 BLAKE2B 54f436ea253ed1622a4e7ebccfe6279b73728030ff652aa93f7d02bbf28d5b2bcd50231766b1701798dd0cc1cfb16b98950498eecdaf453e59a9bbc43773c975 SHA512 223dfe74cb784e6e6d53f8a8ccf939a938be17fe039676d4750f0b3f767cc0c967fd69c3fce054983cad1739901c7cbb262c3e61b9ada0d56af1815a69f6bb7b
-DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
-DIST gcc-4.8.3-patches-1.1.tar.bz2 19882 BLAKE2B b05fd9d568c99b52b455d46ed18f54c019c082b9479140e241ce3b84b911bef1309f576fc1dae3b597a2abb1dc508c1213a9e8b76696d76667cb10a3281817d0 SHA512 8512ec54fb2d482e08ca54042e11c6334d653ec850cc7c920ed95654575222ac0303caa35cd46e80f1985d86cd229f35e26e0eaca1ae623fd8d336940148801c
-DIST gcc-4.8.3.tar.bz2 86126808 BLAKE2B d41fbc0010319ac392e07e59cebdfc5afb20760cb7d7cb8001a6462b36114bf3484165b688216a8670f9d73474e869582ec24e80a5cbd16d36db2f8bbdcfbc76 SHA512 2b40d231e8445f9c1654137df509f09ce1187b475138ca7f648f710d922a1718f740b2d8a37c26e16b5e27900c60358be98229ae884a6f1f70e9df44ad24d02b
-DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
-DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
+DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4
+DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995
+DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
 DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 BLAKE2B 6a8a154259664b47c8b18b55e6f5180ca27396ffd3267b34406296dbad4fa966c945eb445a3013b972ce4468fdf1be14568bb20db89b4a0aa861a35404dbceea SHA512 70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940
 DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
-DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
-DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
+DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057
+DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 BLAKE2B 56f7f9722ba446d44753504616b877b522c7497be4cae87a6a090b8cd77aabf47a79e74640f6df9aea9a5fa981016627601e780c5632d6d5e09a1bd2ae163384 SHA512 e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
-DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
-DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
+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.3.0-patches-1.0.tar.bz2 6757 BLAKE2B ffe6a69e61dc4379fc77b0bf21971ff6fe482edd315ae1243e55b147ad5794320816fbfc3f85ccebe34de080e2c5b718b60b59064aaf095e905c1b41d7c08168 SHA512 a86ffc03940afa12c44b919f861b9459a3cd460cd4680dce8316755021789530640977e90c4cff89be768fc62e0e24d9bee0a1ee76c537ad88c8f4ed07f1a73a
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
-DIST gcc-8.1.0-patches-1.3.tar.bz2 10713 BLAKE2B 3e5cddf5b0c0b9b2bbd2b0aa546dc3aee9bf0e8421656c9260bb7561baa8bb53f7b6ad651bf12d68102fd9e9f97fa17c3306d52a657a46d2dedd16e9a1a74579 SHA512 37c785fbfd801d48c46c65e21d33085c1470942531b8f13c28f933debcec944a1389a50fe0f72afa7dbba25a931959a3ebb1c42911abadd11ee530812f1034bb
-DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
+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.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68f3bd1664e6ce3500a3dc3003d37c03fe81857698957770a135eadd395a7767fa804d354ecdcdeb1d83623280ca569d4ec SHA512 0efadd2481713992807fed2683666f1094b3757674754601c079569f3ef70cd7aed3cefc9f815f4e59a21d37e4e940c122df714e16f3878a5f966450c4273669
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
-DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
-DIST gcc-9.2.0-patches-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
-DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+DIST gcc-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.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 kgcc64-10.1.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0
-EBUILD kgcc64-4.1.2.ebuild 1063 BLAKE2B 8f71e382395ccb063a6693d26d0825d4607bd6530eb52c6f3b5f75a0fbcb1f5caec9b8e6250bfbf7dc21ef9ada56be76ac78f5a4df707412b16bdb36782da6e6 SHA512 ad8c8d75bc819e285f37ef9bd05c38eab78410cb32508a2f26bed8689b8e421dca273e6cbe1408753cc3456983bd0002cbe9c12b616eeb834fbcd1917e21b2f2
-EBUILD kgcc64-4.2.4.ebuild 938 BLAKE2B 10f2a9efbd453f55123b962a50723aac93e1efd7c2013daad6623373f682f02dcf085cb312f738bc1a93b959754c2ee48713cbfe3a7e71111ed7b56d4e3018ec SHA512 9ac3fc9ff2a6f2a8c972d512ccf268e6faec8e7e79aafaa1906ff6939f27bd6d8cc8e0cce4424cdd629240ebffa7f78e89135b5e14342ee17b472f2816a4db69
-EBUILD kgcc64-4.3.5.ebuild 995 BLAKE2B 753b65e5c85d91f60c5aa5d4c0d66afcfc299c7284c0771f9dd7a7831faa60b3505400b290e4fb86ec5d0c2af476e3f0b092a85061ddedc7e75efa5e0df24c4e SHA512 88d6a67770a4065fdd0bd80e5e55d8521807d5810f3693185af99b4680f52434cbe3734ee64b4eba6854cbc47ca34b13020b16aea552a9f975a5a915d3317e70
-EBUILD kgcc64-4.4.5.ebuild 1131 BLAKE2B 6b5cd759f83c1b025c289d29f4dc778a17ec41cfc74fc2b04c69e37f86289c268bfa79cfce953783b8ea80c42d6ee10f8dbcdacefb819abea6a7f9eb6961cc7c SHA512 93247f08b41f1483d7e8698ce657ebefb2ee74a982a9ce517f2919198b7f589030e8a32e49a96a3d2400476f413639e1e9085570244f21c56a57173923600333
-EBUILD kgcc64-4.4.6.ebuild 1131 BLAKE2B 87cd21a1405d4407df4f48a0714b45b9dfa253332c05a760254f39d4e98228b966ca3c90afb7de21657bde97d677b8c3339d055738d28ec7738a7e2979f028db SHA512 bb6c343c87842ea7f2f04390f66d239161a344e9aca79f734301e4ba067d9c47d1e52b2a0c0d3cae71c344a7031c79fd1e99c8fb9d261d9974955f4b6b29dab8
-EBUILD kgcc64-4.5.3.ebuild 1153 BLAKE2B 31354bbb8f32a515d586ba1da04cd5980b5da8ac2811fa42df852efe9ae3232af2eec91cb07bc175349c6f7566c7928933ba67516ab8c0cd64ceb53beee593d8 SHA512 3c7b1b914eba66be205f6928de9ba629e7bd9b38b8f620084ff956c4a598e1c7b33248d6f75f48bf2315444c4fc5f88d58eda87e60393c66122e595701a11de7
-EBUILD kgcc64-4.5.4.ebuild 1153 BLAKE2B 351b0dda9f84332b84d82744a1cb365aaec15a0b399d2167ffbfff37794eaaf4cfcfb2b4e41bb5ea069e45d0145cac04206617cf5ec3c78aee2ad82865c24bd6 SHA512 427a377784c1464d00ebabfba33a7de0c70184c6e148bf83b09988bfc8f00393003fe2ca1df18f27dbc5e8e1f58c11e61328c5308e02f560d486c199696bd0ed
-EBUILD kgcc64-4.6.4.ebuild 1153 BLAKE2B 6fb2a3c8e867c27bf0c3a4efd8ac5bb112911a8678eeb710ba536382707fa282ebc1e76276b3b3a9fe0c62ff86f005dc063c6dd2dc37d39a07d3ab759d6b4ba0 SHA512 6d7850df8d66bba54328eb091da2d3214e511c2f335b93a9e7252c40eff47f1dfac475f6be84fcb4868a17a2de9711250d8ba2dd3d997408558faed7cbcae9ae
-EBUILD kgcc64-4.7.3.ebuild 1153 BLAKE2B 6cf36e4ffc6a75c754b19353ef6682420d67f3717f47dade8c173b0811ec5b3cc32820ceb955778a14471c864885dc31987a53fede4b24b00d1311321617e821 SHA512 9dd2ce0a0559e15b841712b93dbfd7c722bd80817f5e01b86073585d3e336735f7267c0c52fcaa7b17dbd65ad30e6fab8640a0b33a0232c5b2d1b9ba01194265
-EBUILD kgcc64-4.7.4.ebuild 1303 BLAKE2B c5594af5425ff7fa889ff4b04285be9a3062ed598db524d5ab49e1a8346855af4d272e57849d235781862a54d4a9a344f7d11e07a9177d2356093ae9701cff1b SHA512 5164be3e28b01bb88750d95d1dbfb8cf0d859ce3b4775a2d8c76f8ad0616936198388c761e4221fa4042ccc892c717b92ccea7c379703f38a3fe4372cc21080b
-EBUILD kgcc64-4.8.3.ebuild 1153 BLAKE2B 80cdbfffb00c0c0b473953d4934a2337e5b8ac98d92dd54f283cc5490cd8d0e4313141a47e29679af3f96a6115338db269f7f63ac5e09abaa94c63c91cefb20a SHA512 f0032e58d814a7a255567f91faad3a6f86a06cb4395e164ff4f18bbd3ab9ff7926b918b870c33f8d131dbf0aaf0e09435e227ed7caa76da1a7843e291f85c914
-EBUILD kgcc64-4.8.5.ebuild 1153 BLAKE2B 6cf36e4ffc6a75c754b19353ef6682420d67f3717f47dade8c173b0811ec5b3cc32820ceb955778a14471c864885dc31987a53fede4b24b00d1311321617e821 SHA512 9dd2ce0a0559e15b841712b93dbfd7c722bd80817f5e01b86073585d3e336735f7267c0c52fcaa7b17dbd65ad30e6fab8640a0b33a0232c5b2d1b9ba01194265
+EBUILD kgcc64-10.2.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0
+EBUILD kgcc64-4.9.4-r1.ebuild 992 BLAKE2B dfe61ccae8cdd17c841ebe7bbb6fec51725d75f60533f6135c28dbf873b7986985eeb412021319cf475ce3e8f776d152c57e233fae67c7561fac177c4e3d7359 SHA512 b3272023a529991488d6a8e5b950c547a6b0137d56faffbfa330e2cd1167360ccc42da38d6cd9c3b77f63f6ceac4f176701f0fbcb87774155954ad9d982a09d9
 EBUILD kgcc64-4.9.4.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
 EBUILD kgcc64-5.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
-EBUILD kgcc64-6.3.0.ebuild 1159 BLAKE2B f83495ec47fe7910a3fc4f9536220b1a6ec084969acd6cb3fc2d6580f51e9e4ef609362afbd0690ffae6f99670985bb3fbde10f18ab40b972aa0dc490c3f034f SHA512 a98daf09f088a30a7ef92625b131a4b3226afae92b2509e7c775d7b2fc4e2df39151f6a55fba52ce4382bc8a3d8288d100411cf3996ed561d03b80986236cbcd
+EBUILD kgcc64-5.5.0.ebuild 985 BLAKE2B 248c8e93ca6bf689b9047c13a2c169b9568da5debedef850acdf88440e9450c6f0ff9d095b2b3e124f730e545add1241972ecbd639464e3cf2525ff533cbd75c SHA512 62ff3f36be9beee2d754ff193574ecd7382a94ccd1a6584d8473e447e89b7229c3e1581cf74d89e836c9d1495ae10c8581dd86ab35b08409d7afd29b685e22cd
 EBUILD kgcc64-6.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
-EBUILD kgcc64-7.2.0.ebuild 1181 BLAKE2B 99153553f84334a7ece38f334fe13ac352d9a0b48d91380ed5abd81def64deb63bd83a7bcfd5c70835377789e2344e7328f4a70d61dc6b3f8ffacff6752924da SHA512 51f36aa08bec91349e8099a241564f2c9dba4175cb704bdc25bdf0d1eaa1fc544b875b1770e857b77e6d806c36b226379dc2817b59f1a607483d044fe6623c89
+EBUILD kgcc64-6.5.0.ebuild 985 BLAKE2B 74fbf80028f7ea7714f35dbd97993a301d70abbb648c6ee53f538f37000c451337a6fad5cd30f8cd5acab754293bded4f80d56e2a0f59bdb0e25a892c4e6f3fa SHA512 c33f877683b43fa8120001eb77265a841a6079842a3f069c933346e582ed1d66bc2220da3449bb459d32a5ce191634b0879cc580ab47cee3eeabcf90b81f566d
 EBUILD kgcc64-7.3.0.ebuild 1157 BLAKE2B 65104f756288207e86c110dfbfd1c617ec26cebb6c025ade86d0c61f3071c700e137aa0fc06d86484e463c9b592ec7ccf020dc4ea6959ecd67c03ce9d3954332 SHA512 29249a057bc9614939c43109c73aa0f91c479d0cb815ab6119d9c6a29471f82b97e9a0a4ac05d91c76dd1781ddc72fb8d3a3f8aaeb42d2768dcb2aac706733c1
-EBUILD kgcc64-8.2.0.ebuild 1321 BLAKE2B a2a732dccd7039508c08b50a6c9ad64eb06c644c09683dd0d3da7d5d0870d60c35dc678a856a3968daa9a4b83a8aca214cc8162f7125368056437e10e12b5602 SHA512 e8b2c948954d58768c723df1f63f01c8424f01dfe88b461e0b9d1ab6deceb24cc82519bac59a37be90ec449803f046451b4a594ec6a6666a880f7dd37e13c3a3
+EBUILD kgcc64-7.5.0.ebuild 984 BLAKE2B c82e2f3e5391d3ab1499d1aae028a430301ef3493fc62ff635a0a3d750b6e38f369e55b22c91c66e4563c54fc75bcca8aad5e2818311dd0310f1f0de00b00038 SHA512 44c7c1d3172aa145fdab38fa0e6d19ce02c0a57964aa16fdd09adbc57f428ec733279d2391527d59d5e23d319dd53efaac89aa33847a1742160291657d230a67
 EBUILD kgcc64-8.3.0.ebuild 1157 BLAKE2B 65104f756288207e86c110dfbfd1c617ec26cebb6c025ade86d0c61f3071c700e137aa0fc06d86484e463c9b592ec7ccf020dc4ea6959ecd67c03ce9d3954332 SHA512 29249a057bc9614939c43109c73aa0f91c479d0cb815ab6119d9c6a29471f82b97e9a0a4ac05d91c76dd1781ddc72fb8d3a3f8aaeb42d2768dcb2aac706733c1
-EBUILD kgcc64-9.1.0.ebuild 986 BLAKE2B 569ffabeb9484e79ce10b43cf499977e44ef5c5386cf8e6bd5baed6f5bb98ca6537c54fdffbd7ea48ea1a0c1e24e09081fe9acd79b8bc338213bb06752d88c51 SHA512 8f090640747c86095463bfae45030923b31df528d2c993dff43efd2fb1d312240501352d962dbdd385b9e45e6ccab64d743d968c0e38ae0967eaf0e204d88044
-EBUILD kgcc64-9.2.0.ebuild 983 BLAKE2B 0a96f42ef2227f6c9c9d518804ad7bd872d95deee027c7daee587652cf35ce8afd0649fd0e94e4fc00e6905fb08d36d322adb9a037030716254111cbe0f21280 SHA512 67c0884d62b0222c4c5f298b5d2b6947061eab62abee1706ce6bc0fa71bea7dcd5328ade97cbf28766494e1189f3d180aec84a13ed0c1c13549623b042d5f810
+EBUILD kgcc64-8.4.0.ebuild 984 BLAKE2B cad716eea8e21f5a28e76b691f3e1708e34a14412adafd5a3a3f50efecfdbdcf157126eec6d3170498f382a5301055f04d9a69c501d427c7efd1d585ea5eabc1 SHA512 5400c89988090943835e0750c438dd7c3924ba283d7a8c6fe1c4a813c8957ca26823d8a31db4dcf4b09f1d245d6d72de820c2afa00551d1925cc19d560078394
 EBUILD kgcc64-9.3.0-r1.ebuild 983 BLAKE2B 601cdcdc1354959238002739128620503cf4e748cbaa8e336cd125b4989ade267b4d9c266359c69c3d94e7201a099925c8040c0a5112626941ef72a9516671c2 SHA512 532ec5eff5f6a7f03af01f69a73b3f9f3724c74843df39212bee30103937818b626fc8801752de87c966bfa64c60cd380df8ab224c3c186502d5af394603e8df
+EBUILD kgcc64-9.3.0-r2.ebuild 984 BLAKE2B c82e2f3e5391d3ab1499d1aae028a430301ef3493fc62ff635a0a3d750b6e38f369e55b22c91c66e4563c54fc75bcca8aad5e2818311dd0310f1f0de00b00038 SHA512 44c7c1d3172aa145fdab38fa0e6d19ce02c0a57964aa16fdd09adbc57f428ec733279d2391527d59d5e23d319dd53efaac89aa33847a1742160291657d230a67
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/kgcc64-9.1.0.ebuild b/sys-devel/kgcc64/kgcc64-10.2.0.ebuild
index c4d09fdda715..e0c1432958e8 100644
--- a/sys-devel/kgcc64/kgcc64-9.1.0.ebuild
+++ b/sys-devel/kgcc64/kgcc64-10.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -15,7 +15,7 @@ export CTARGET
 TOOLCHAIN_ALLOWED_LANGS="c"
 GCC_TARGET_NO_MULTILIB=true
 
-PATCH_VER="1.1"
+PATCH_VER="1"
 inherit toolchain
 
 DESCRIPTION="64bit kernel compiler"
diff --git a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild b/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
deleted file mode 100644
index a89d7c2bc1c7..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0.1"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-KEYWORDS="-* hppa ~mips ~s390"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-src_prepare() {
-	toolchain_src_prepare
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.4.5.ebuild b/sys-devel/kgcc64/kgcc64-4.4.5.ebuild
deleted file mode 100644
index 67ff0e4f40d8..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.4.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.2"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.4.6.ebuild b/sys-devel/kgcc64/kgcc64-4.4.6.ebuild
deleted file mode 100644
index e291e4101e94..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.5.3.ebuild b/sys-devel/kgcc64/kgcc64-4.5.3.ebuild
deleted file mode 100644
index 09c962b3ebbf..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.4"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.5.4.ebuild b/sys-devel/kgcc64/kgcc64-4.5.4.ebuild
deleted file mode 100644
index 5a1076aee798..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.2"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.6.4.ebuild b/sys-devel/kgcc64/kgcc64-4.6.4.ebuild
deleted file mode 100644
index 7e15385f295f..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.6.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.7.3.ebuild b/sys-devel/kgcc64/kgcc64-4.7.3.ebuild
deleted file mode 100644
index 0a3860a1a716..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.3"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.7.4.ebuild b/sys-devel/kgcc64/kgcc64-4.7.4.ebuild
deleted file mode 100644
index 2c653942cd61..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa ~mips"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-src_prepare() {
-	EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
-
-	toolchain_src_prepare
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.8.3.ebuild b/sys-devel/kgcc64/kgcc64-4.8.3.ebuild
deleted file mode 100644
index 5c9c68c8ec5f..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.8.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.1"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.8.5.ebuild b/sys-devel/kgcc64/kgcc64-4.8.5.ebuild
deleted file mode 100644
index 0a3860a1a716..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.8.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.3"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild b/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild
index 6f49ef3db6ed..6e9d9cc4f374 100644
--- a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild
@@ -15,13 +15,14 @@ export CTARGET
 TOOLCHAIN_ALLOWED_LANGS="c"
 GCC_TARGET_NO_MULTILIB=true
 
-PATCH_VER="1.0"
+PATCH_VER="2"
 
 inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
-KEYWORDS="-* hppa ~mips ~s390"
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
diff --git a/sys-devel/kgcc64/kgcc64-4.3.5.ebuild b/sys-devel/kgcc64/kgcc64-5.5.0.ebuild
index 1d46bcad92e1..6af7c6b045ab 100644
--- a/sys-devel/kgcc64/kgcc64-4.3.5.ebuild
+++ b/sys-devel/kgcc64/kgcc64-5.5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -15,14 +15,14 @@ export CTARGET
 TOOLCHAIN_ALLOWED_LANGS="c"
 GCC_TARGET_NO_MULTILIB=true
 
-PATCH_VER="1.1"
+PATCH_VER="3"
 
-inherit eutils toolchain
+inherit toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="-hppa ~mips"
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
diff --git a/sys-devel/kgcc64/kgcc64-6.3.0.ebuild b/sys-devel/kgcc64/kgcc64-6.3.0.ebuild
deleted file mode 100644
index 2f50bbcee362..000000000000
--- a/sys-devel/kgcc64/kgcc64-6.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-6.5.0.ebuild b/sys-devel/kgcc64/kgcc64-6.5.0.ebuild
new file mode 100644
index 000000000000..b93df5a46bd2
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-6.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="5"
+
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-7.2.0.ebuild b/sys-devel/kgcc64/kgcc64-7.2.0.ebuild
deleted file mode 100644
index b9de1580ef4c..000000000000
--- a/sys-devel/kgcc64/kgcc64-7.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.1"
-PATCH_GCC_VER="7.1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild b/sys-devel/kgcc64/kgcc64-7.5.0.ebuild
index 66f89f290fda..c52a4bfafc3e 100644
--- a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
+++ b/sys-devel/kgcc64/kgcc64-7.5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -15,13 +15,13 @@ export CTARGET
 TOOLCHAIN_ALLOWED_LANGS="c"
 GCC_TARGET_NO_MULTILIB=true
 
-PATCH_VER="1"
+PATCH_VER="3"
 inherit toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
 # Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa ~mips"
+KEYWORDS="~hppa ~mips"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
diff --git a/sys-devel/kgcc64/kgcc64-8.2.0.ebuild b/sys-devel/kgcc64/kgcc64-8.2.0.ebuild
deleted file mode 100644
index 7450e922f092..000000000000
--- a/sys-devel/kgcc64/kgcc64-8.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_GCC_VER="8.1.0"
-PATCH_VER="1.3"
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-src_prepare() {
-	# upstreamed patches since 8.1.0
-	EPATCH_EXCLUDE+=" 93_all_arm-arch.patch 96_all_lto-O2-PR85655.patch"
-
-	toolchain_src_prepare
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-8.4.0.ebuild b/sys-devel/kgcc64/kgcc64-8.4.0.ebuild
new file mode 100644
index 000000000000..da401c7c46b2
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-8.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="2"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-9.3.0-r2.ebuild b/sys-devel/kgcc64/kgcc64-9.3.0-r2.ebuild
new file mode 100644
index 000000000000..c52a4bfafc3e
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="3"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}