[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/files/, sys-devel/gcc/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     e5f9d97f02ef1b61fcee819e86130b081ef2c378
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 16:49:11 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 16:49:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e5f9d97f

sys-devel/gcc: cleanup and add 12.1.0 for Apple M1

Cleanup old versions, no longer supported by toolchain.eclass.  For
bootstraps where no C++ compiler is available, we'll have to manually
bootstrap a compiler in stage1.

gcc-12.1.0 is "hybrid", it uses normal sources by default (tested on
x64-solaris), and uses M1-capable sources (Ian) on Darwin targets
(tested on x64-macos).

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/gcc/Manifest                             |  35 +----
 .../gcc/files/gcc-12-no-libs-for-startfile.patch   |  15 +++
 .../gcc/files/gcc-12-prefix-search-dirs.patch      |  37 ++++++
 sys-devel/gcc/gcc-11_pre20200206.ebuild            | 108 ----------------
 ...gcc-11_pre20210226.ebuild => gcc-12.1.0.ebuild} |  66 +++++-----
 sys-devel/gcc/gcc-4.1.2.ebuild                     |  68 ----------
 sys-devel/gcc/gcc-4.2.4-r2.ebuild                  | 137 --------------------
 sys-devel/gcc/gcc-4.7.3-r1.ebuild                  | 143 ---------------------
 sys-devel/gcc/gcc-4.8.5-r1.ebuild                  | 106 ---------------
 sys-devel/gcc/gcc-4.9.4.ebuild                     | 103 ---------------
 sys-devel/gcc/gcc-5.4.0-r4.ebuild                  | 105 ---------------
 sys-devel/gcc/gcc-7.4.0.ebuild                     |  92 -------------
 sys-devel/gcc/gcc-8.3.0.ebuild                     |   4 +-
 sys-devel/gcc/gcc-9.2.0-r3.ebuild                  |   4 +-
 sys-devel/gcc/metadata.xml                         |  72 +++++------
 15 files changed, 128 insertions(+), 967 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c2eb112112..bc6c8f741c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,42 +1,15 @@
-DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 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-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
-DIST gcc-11.0.0-patches-6.tar.bz2 12744 BLAKE2B 05e8d8b87cd1069bc6c03a6cbd61e5414148b7c6467e5b2ebf03af1493075280d8f1a5a123148f786724e3f813ef7fbb5f2728598ab4ab7879b4e649f592156b SHA512 9e873a40eca07e471a9832ed062575063144554ca306b60a9b5f7da61fa1f148a13fd5ea933c852d105931e452de1c6ab3cd7baf4f80da17b9d81eeb36c5b3fd
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
-DIST gcc-4.1.2-patches-1.5.tar.bz2 53576 BLAKE2B 16dcbf8bac85c3e95a8526ffd504f298ac09fbd79d8ee9f633782ffcd177eb0de256dc8ff36d45dc40dd8582b712e2ea0cd3b2063e3205d51cc022ad7befa7cc SHA512 3c7c15f740ec80aaa6f9c1ad77daeb2a2527f1719fbcc5d96d956e1fe1f24da961b1b030cf2bb631f1a0cc970f6462823e9a78441c9fd6b57f3645b04cd6a362
-DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 BLAKE2B cfc7dd4c7a0b1ed80c491d4ad56b05b05ff308fdbed2faa1b9f15b10c0f7834ee4ffcb0df1619f959f7a1a5f315305b550665c232404a8a3306e3e615539a0c8 SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b
-DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
-DIST gcc-4.2.4-patches-1.3.tar.bz2 24723 BLAKE2B 55b9d4f1ca80327f14fff35d6184e915502ea248bb2aae823e749c88a20c680b20ce3dada732c699b1ece9dbeb5a6bc7f5b610a074c924736bd9e5983de06c7d SHA512 fc1ad5debf0ba6a755758ff4e2e1b41f3ac753b4a9c600c1525ac99a8f204c511257ee57fa287ff8296fe563859c931f8d5ca252f85656dcf7436571c1c87a06
-DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
-DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
-DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.7.3-patches-1.4.tar.bz2 43148 BLAKE2B 9b7472c799a8fddd59f0e18d638aa97def9049e3a0acc84712337b231a0dcad947ac41302e29b3e4e9d1197e41629a5c198ce102cf508ab0a4efb23276a788e7 SHA512 6dfc5b405e2eca70642f42974d7d3183ff8f0eed3e9f29fbf197e8959bc1795a1ba54df99e4f73df1017332f46bdf3d1c10d4b0f89fea71d604dd5ebda488c22
-DIST gcc-4.7.3-piepatches-v0.5.5.tar.bz2 15378 BLAKE2B 94c026b5878c59d9c50ae61285b0b1d6e9fd02b9aebe1f92996e6c4475626a1bd7beb37582e99eb624fd9a8a8354ae293c86feb40a9169f729fd38f332fc8a06 SHA512 d0189d2e4049d471dedaddcba319fe2c2b29855f7b33e84b26051504ead2936c852ef7870a1d19d755bb343c9b121b0ce5295665ab4ff1e448436bd448c08e1f
-DIST gcc-4.7.3-uclibc-patches-1.0.tar.bz2 3013 BLAKE2B 73389fcedfe6209d67551bc768922ff7090d817020ac2d4e62b40fc8a167569e2dd2f17ab76870b0e3f117486afd07ce724fd043c680d67de5dad715ca76d536 SHA512 6119159300e76be87732f2a44b1a9388228235d7832370dbae531c2c96694ea42ed4c75acf7abca98ec0035fbc50a8bf84225574505358c2739e64b0f3fd6a95
-DIST gcc-4.7.3.tar.bz2 82904224 BLAKE2B 084a21a317de5ccddf480e429f95d13f6c0c3a0102c38692aff0283b280aaeaf874e602a12341418a100566159bb54a14a3deb0a9c8604388ea08aac9e484f93 SHA512 5671a2dd3b6ac0d23f305cb11a796aebd823c1462b873136b412e660966143f4e07439bd8926c1443b78442beb6ae370ef91d819ec615920294875b722b7b0bd
-DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
-DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
-DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
-DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
-DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
-DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
-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.4.0-patches-1.8.tar.bz2 32886 BLAKE2B 85879ba552ff21e198de568b2a1f2544d6cf542174af3ca571e41a504373bbc8912a87177a413883f194d909237eeeaf65366e6b93c2b917f803b3edd10bbff5 SHA512 10c1102a37d9d485665cca606318a1da6eec2188998d340b91a371c9defa6fae285619f9cadad2546de0b7f1068e9eaf653714462d3331db3197308799927a6b
-DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
-DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
-DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
-DIST gcc-7.4.0-patches-1.1.tar.bz2 8778 BLAKE2B 52b02b3c619b99912ee254599788abebe3963cf85e49b56166069318e340a8e271d767e82798e6062fc2a042a86a88da66ab95f2d9e42933ff17688d616a903f SHA512 02ec2eb2460e24cf46f7a04ca3b80ca120719389a54a740070e991d9c96b6fd55d1fa04eb4249fd3043edc9c0f6519b5babcce76036cd0146183512aaae2d573
-DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
+DIST gcc-12.1-darwin-r0.tar.gz 131006433 BLAKE2B fe94275821772586b90d003e5179a72c5662216d216db6b7fd066df8873744d5edff25521f3f30cb08d45f59545fa03e44364bdf831998a0285c0ba5df0c1547 SHA512 8bfae411e8f6f853ad50cda4f7bd672217883b305893c8dda9f630d712d8ef0857e89c8f4ce6c446340041d8da2ec98e6dfcc99861e844eb99c6f837e4f47dbb
+DIST gcc-12.1.0-musl-patches-4.tar.bz2 4818 BLAKE2B 56ba1c14cb911bad6b0afd4d03c28d95762e781285db98a5b27db18a5dd47f23ef4987ae557bd3e95004f15159495ffd992b9775110c1d8f284e25b81abd05a5 SHA512 517e2a4b16e8d7b3bb7ce4d06d4006c0488161cbd878b8bffc8c55e244bccd2cc865f8128912b7d086ef12c73d173bc61cb80682f4d06ae01466769f0f8dd41d
+DIST gcc-12.1.0-patches-7.tar.bz2 12049 BLAKE2B 85a67187a78194aaaab5a7cdbe953309ece37036f20bcc793d3cddacad5902d38f0bd1d3417de867624e282b4389d7476ef174909aafc64e1e5c8e073980bf71 SHA512 14bfbe616cd25456b05ce68daa4458d5f3ede6e50232b49ddb01c30494f8862c230d4a16402f298857e143102b9ff1a208db5c58fff0c0acc65cf3ff68c98cdc
+DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 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.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gcc-cygwinports-0de6b2ae6b6577eb0891a7ca8d551bdfa79bf5e8.tar.gz 20183 BLAKE2B dc9a4c78f98851ed77720d4c06d3fbf9f2d7d0e81a825cc89026994060fd29214f111fd3a52cec6518417cab2be89caf4a844a0869136287f174147ca7a6ebf3 SHA512 d01ee85a1327e7f6f16b3c2de6659699764f365215bd3e58247c5c65594153b9232bdc43ff89420cac75ad908ed39c7ff9fa4006818f5dd209b792d34d9ae7de
-DIST gcc-cygwinports-11fa2eec213324d64673ad41358f726f6523667f.tar.gz 23047 BLAKE2B 83e44a2eed9e134ea2531e3ecff4479f4d305a55d14729ed11c91199c1f56ec7e2d4df48d56de11ba43a9e936019943edc370a04a26f6b3bfd5616230feeffa5 SHA512 f8cbf3b2b20c1950d0984fe672536d92f7d05b065495d93205d72b7578e696847f074430c6e642668d1c0c26fa9d98a4dfd3fce7030d45f2d04f80499437587c
-DIST gcc-cygwinports-f44d762eb3551ea0d81aa8e4b428bcb7caabb628.tar.gz 32780 BLAKE2B 364353bf379a2a950050148caf2cef86239f2418a98f72b3edec4cf56e43e7d07601f4d1ca8103c691ddddff0fca96a6a8c728e2e50bca373c34441bdc7505be SHA512 d5bc37965745fa32a3ddd357e658bd066d4aadf19eee7a30047f4dc6f47450d320e33cbbe4bf22fa6f5e30f7f41ec6ec3a250df56760a38df0f14fea3e34a83e
-DIST gcc-pre11-apple-si-a172e87.tar.gz 125440972 BLAKE2B 45477b580b9637abbb1d5182bf5821b3acff4ad71c13be508e598df666fdc3621c44b234e7ca18ff0f82236b5a7a05901d790a42e671b7152e2605ccdf6766ed SHA512 52ce4d88a6c471e193ec11003af336bcd608088bd0e6268ad6f51db89749404be8087a7088bad21482b34739bbcc650aeb997837a7aed640649bd076258016a9
-DIST gcc-pre11-apple-si-f1bedb9.tar.gz 124531876 BLAKE2B b7450b5b3cafce9f92e4f793439d767193aa609f924ae8a8d07dc353d9e64c6d2881252706ffec93ff91c1a3970a8688a3d9454b880e5d7587795ad284790fe7 SHA512 2cc21803e9236db234f31584aaabb503b7a9612b82ac54fac389aeb19c4e36d70f60e3660f63e35462f8a494862c88951f4d6434fad7e4dafc0f5a041e906b28

diff --git a/sys-devel/gcc/files/gcc-12-no-libs-for-startfile.patch b/sys-devel/gcc/files/gcc-12-no-libs-for-startfile.patch
new file mode 100644
index 0000000000..8cc59a6ea3
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-12-no-libs-for-startfile.patch
@@ -0,0 +1,15 @@
+* do not generate multilib paths, since adding those dirs, e.g.
+  /usr/lib/amd64 or /usr/lib64, screws up Prefix badly (in %D)
+  see also: http://article.gmane.org/gmane.linux.gentoo.alt/3575
+
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -4740,7 +4740,7 @@
+ #endif
+ 	      info.separate_options = false;
+ 
+-	      for_each_path (&startfile_prefixes, true, 0, spec_path, &info);
++	      for_each_path (&startfile_prefixes, false, 0, spec_path, &info);
+ 	    }
+ 	    break;
+ 

diff --git a/sys-devel/gcc/files/gcc-12-prefix-search-dirs.patch b/sys-devel/gcc/files/gcc-12-prefix-search-dirs.patch
new file mode 100644
index 0000000000..2e733472c0
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-12-prefix-search-dirs.patch
@@ -0,0 +1,37 @@
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -2691,6 +2691,34 @@
+ {
+   struct add_to_obstack_info *info = (struct add_to_obstack_info *) data;
+ 
++#if DISABLE_MULTILIB
++  /*
++   * Fix multilib paths for our prefix, that is alter lib64 and lib32 to lib.
++   * No allocation needed, since the path won't grow but only shrink by two
++   * chars. We should not modify host multilib dirs, otherwise libs might not
++   * be found in /lib64 or /usr/lib64
++   */
++  int elen = strlen(STANDARD_EXEC_PREFIX);
++  if (elen && strncmp(path, STANDARD_EXEC_PREFIX, elen) == 0) {
++    /* multilib dirs are put at the end like ../lib32/ ../lib64/ */
++    static char const *mdirs[] = { "../lib64/", "../lib32/" };
++    int plen = strlen(path);
++    unsigned int idx;
++    int mlen;
++
++    /* For each path replace the multilib dir at the end of the path. */
++    for (idx = 0; idx < (sizeof(mdirs) / sizeof(mdirs[0])); idx++) {
++      mlen = strlen(mdirs[idx]);
++      if (strncmp(path + plen - mlen, mdirs[idx], mlen) == 0) {
++        /* Overwrite the part with null-termination. In prefix the only multilib
++           occurence is the one added by gcc so we can end here. */
++        strcpy(path + plen - mlen, "../lib/");
++        break;
++      }
++    }
++  }
++#endif
++
+   if (info->check_dir && !is_directory (path, false))
+     return NULL;
+ 

diff --git a/sys-devel/gcc/gcc-11_pre20200206.ebuild b/sys-devel/gcc/gcc-11_pre20200206.ebuild
deleted file mode 100644
index e1bfc2eb77..0000000000
--- a/sys-devel/gcc/gcc-11_pre20200206.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-GCC_TARBALL_SRC_URI="https://dev.gentoo.org/~grobian/distfiles/gcc-pre11-apple-si-f1bedb9.tar.gz"
-PATCH_GCC_VER="11.0.0"
-PATCH_VER="6"
-TOOLCHAIN_GCC_PV=11.0.0
-
-inherit toolchain
-
-#KEYWORDS="~ppc-macos ~x64-macos"
-
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( ${CATEGORY}/binutils )
-	kernel_Darwin? (
-		|| ( ${CATEGORY}/binutils-apple ${CATEGORY}/native-cctools )
-	)"
-
-S="${WORKDIR}"/gcc-darwin-arm64-master-wip-apple-si
-
-src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
-	toolchain_src_prepare
-
-	if use elibc_Cygwin; then
-		sed -e '/0001-share-mingw-fset-stack-executable-with-cygwin.patch/d' \
-			-i "${WORKDIR}/gcc-${CYGWINPORTS_GITREV}/gcc.cygport" || die
-	fi
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	eapply -p0 "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		eapply -p0 "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		eapply -p0 "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	eapply -p1 "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44107
-		sed -i -e 's|^ifeq (/usr/lib,|ifneq (/usr/lib,|' \
-			libgcc/config/t-slibgcc-darwin || die
-	fi
-
-	# fixup a what seems to be a typo, we need this at least to finish
-	# compilation on arm64-macos during bootstrap as gmp.h else won't be
-	# found
-	sed -i -e 's/ALL_SPPFLAGS/ALL_CPPFLAGS/' \
-		gcc/config/aarch64/t-aarch64 || die
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-			# bug #657522
-			# A bug in configure checks whether -no-pie works, but the
-			# compiler doesn't pass -no-pie onto the linker if -fno-PIE
-			# isn't passed, so the configure check always finds -no-pie
-			# is accepted.  (Likewise, when -fno-PIE is passed, the
-			# compiler passes -no_pie onto the linker.)
-			# Since our linker doesn't grok this, avoid above checks to
-			# be run
-			# NOTE: later ld64 does grok -no_pie, not -no-pie (as checked)
-			export gcc_cv_c_no_fpie=no
-			export gcc_cv_no_pie=no
-		;;
-		*-darwin20)
-			# use sysroot with the linker, #756160
-			export gcc_cv_ld_sysroot=yes
-			;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-			# Solaris 11 defines this in its headers, but that causes a
-			# mismatch whilst compiling, bug #657514
-			export ac_cv_func_aligned_alloc=no
-			export ac_cv_func_memalign=no
-			export ac_cv_func_posix_memalign=no
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is way too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-11_pre20210226.ebuild b/sys-devel/gcc/gcc-12.1.0.ebuild
similarity index 66%
rename from sys-devel/gcc/gcc-11_pre20210226.ebuild
rename to sys-devel/gcc/gcc-12.1.0.ebuild
index 3aa29c8610..5270c920df 100644
--- a/sys-devel/gcc/gcc-11_pre20210226.ebuild
+++ b/sys-devel/gcc/gcc-12.1.0.ebuild
@@ -1,39 +1,50 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-GCC_TARBALL_SRC_URI="https://dev.gentoo.org/~grobian/distfiles/gcc-pre11-apple-si-a172e87.tar.gz"
-PATCH_GCC_VER="11.0.0"
-PATCH_VER="6"
-TOOLCHAIN_GCC_PV=11.0.1
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="7"
+PATCH_GCC_VER="12.1.0"
+MUSL_VER="4"
+MUSL_GCC_VER="12.1.0"
 
 inherit toolchain
 
-#KEYWORDS="~ppc-macos ~x64-macos"
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( ${CATEGORY}/binutils )
-	kernel_Darwin? (
-		|| ( ${CATEGORY}/binutils-apple ${CATEGORY}/native-cctools )
-	)"
+# use alternate source for Apple M1 (also works for x86_64)
+IANSGCCVER="gcc-12.1-darwin-r0"
+SRC_URI+=" elibc_Darwin? (
+https://github.com/iains/gcc-12-branch/archive/refs/tags/${IANSGCCVER}.tar.gz )"
 
-S="${WORKDIR}"/gcc-darwin-arm64-master-wip-apple-si
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_unpack() {
+	if use elibc_Darwin ; then
+		# just use Ian's source, not the main one
+		S="${WORKDIR}/gcc-12-branch-${IANSGCCVER}"
+	fi
+	default
+}
 
 src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
 	toolchain_src_prepare
 
-	if use elibc_Cygwin; then
-		sed -e '/0001-share-mingw-fset-stack-executable-with-cygwin.patch/d' \
-			-i "${WORKDIR}/gcc-${CYGWINPORTS_GITREV}/gcc.cygport" || die
-	fi
+	eapply_user
 
 	# make sure 64-bits native targets don't screw up the linker paths
-	eapply -p0 "${FILESDIR}"/no-libs-for-startfile.patch
+	eapply "${FILESDIR}"/gcc-12-no-libs-for-startfile.patch
 	if use prefix; then
-		eapply -p0 "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
+		eapply "${FILESDIR}"/gcc-12-prefix-search-dirs.patch
 		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
 		# --enable-multilib), but this does make sense in prefix only
 		eapply -p0 "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
@@ -48,14 +59,11 @@ src_prepare() {
 			libgcc/config/t-slibgcc-darwin || die
 	fi
 
-	# fixup a what seems to be a typo, we need this at least to finish
-	# compilation on arm64-macos during bootstrap as gmp.h else won't be
-	# found
-	sed -i -e 's/ALL_SPPFLAGS/ALL_CPPFLAGS/' \
-		gcc/config/aarch64/t-aarch64 || die
-
-	# allow building with macOS 12
-	eapply -p1 "${FILESDIR}"/${PN}-10.3.0-monterey.patch
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# madvise is not available in the compatibility mode GCC uses,
+		# posix_madvise however, is
+		sed -i -e 's/madvise/posix_madvise/' gcc/cp/module.cc || die
+	fi
 }
 
 src_configure() {

diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
deleted file mode 100644
index 83751a153f..0000000000
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.37 2014/01/19 01:51:34 dirtyepic Exp $
-
-EAPI="5"
-
-PATCH_VER="1.5"
-UCLIBC_VER="1.0"
-D_VER="0.24"
-
-inherit eutils toolchain flag-o-matic
-
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	!kernel_Darwin? ( !kernel_AIX? (
-		ppc? ( >=${CATEGORY}/binutils-2.17 )
-		ppc64? ( >=${CATEGORY}/binutils-2.17 )
-		>=${CATEGORY}/binutils-2.15.94
-	) )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-
-	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-softfloat.patch
-
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
-
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-	epatch "${FILESDIR}"/${P}-darwin-fpic.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix nasty bootstrap problem: we need 4.1 due to no deps of MPC, GMP,
-		# MPFR, but 4.1 doesn't know about *_sol2 ld targets of >=binutils-2.21
-		# we likely have that one installed, so if so, we patch it to *_sol2
-		if has_version '>=sys-devel/binutils-2.21' ; then
-			einfo "Patching specs to target elf_*_sol2 for newer binutils"
-			sed -i \
-				-e '/TARGET_LD_EMULATION/s/elf_\(x86_64\|i386\)/elf_\1_sol2/g' \
-				gcc/config/i386/sol2-10.h || die
-		fi
-	fi
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld"
-		;;
-	esac
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, so force it into our own bash
-	export CONFIG_SHELL="${BASH}"
-	toolchain_src_configure
-}

diff --git a/sys-devel/gcc/gcc-4.2.4-r2.ebuild b/sys-devel/gcc/gcc-4.2.4-r2.ebuild
deleted file mode 100644
index 52e7ff29d9..0000000000
--- a/sys-devel/gcc/gcc-4.2.4-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.16 2014/01/19 01:51:34 dirtyepic Exp $
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain flag-o-matic prefix
-
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	!kernel_Darwin? (
-		ppc? ( >=${CATEGORY}/binutils-2.17 )
-		ppc64? ( >=${CATEGORY}/binutils-2.17 )
-		>=${CATEGORY}/binutils-2.15.94
-	)"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33637
-	epatch "${FILESDIR}"/4.2.2/targettools-checks.patch
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=201490
-	epatch "${FILESDIR}"/4.2.2/gentoo-fixincludes.patch
-
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27516
-	epatch "${FILESDIR}"/4.2.2/treelang-nomakeinfo.patch
-
-	# call the linker without explicit target like on sparc
-	epatch "${FILESDIR}"/solaris-i386-ld-emulation-4.2.patch
-
-	# fix configure problem, bug #416577
-	epatch "${FILESDIR}"/4.2.2/solarisx86.patch
-
-	# add support for 64-bits native target on Solaris (includes fix for #416577)
-	epatch "${FILESDIR}"/4.2.2/solarisx86_64.patch
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix nasty bootstrap problem: we need 4.2 due to no deps of MPC, GMP,
-		# MPFR, but 4.2 doesn't know about *_sol2 ld targets of >=binutils-2.21
-		# we likely have that one installed, so if so, we patch it to *_sol2
-		if has_version '>=sys-devel/binutils-2.21' ; then
-			einfo "Patching specs to target elf_*_sol2 for newer binutils"
-			sed -i \
-				-e '/TARGET_LD_EMULATION/s/elf_\(x86_64\|i386\)/elf_\1_sol2/g' \
-				gcc/config/i386/sol2-10.h || die
-			sed -i \
-				-e 's/elf\(32\|64\)_sparc/&_sol2/g' \
-				gcc/config/sparc/sol2-gld-bi.h || die
-		fi
-	fi
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	# replace nasty multilib dirs like ../lib64 that occur on --disable-multilib
-	if use prefix; then
-		epatch "${FILESDIR}"/4.2.2/prefix-search-dirs.patch
-		eprefixify "${S}"/gcc/gcc.c
-	fi
-
-	# allow gcj compilation to succeed on platforms with libiconv
-	epatch "${FILESDIR}"/gcj-${PV}-iconvlink.patch
-
-	# try /usr/lib32 in 32bit profile on x86_64-linux (needs --enable-multilib)
-	# but this does make sense in prefix only.
-	use prefix && epatch "${FILESDIR}"/${P}-linux-x86-on-amd64.patch
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-
-	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-softfloat.patch
-
-	epatch "${FILESDIR}"/4.2.2/ro-string.patch
-}
-
-src_configure() {
-	case ${CTARGET}:" ${USE} " in
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld --with-gnu-as"
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			EXTRA_ECONF="${EXTRA_ECONF} --enable-multilib"
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				tc-export CC CXX
-				CC="${CC} -m32"
-				CXX="${CC} -m32"
-			fi
-		;;
-	esac
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is ways too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${BASH}"
-	toolchain_src_configure
-}
-
-src_install() {
-	toolchain_src_install
-
-	# create a small profile.d script, unsetting some of the bad
-	# environment variables that the system could set from the outside.
-	# (GCC_SPECS, GCC_EXEC_PREFIX, CPATH, LIBRARY_PATH, LD_LIBRARY_PATH,
-	#  C_INCLUDE_PATH, CPLUS_INCLUDE_PATH, LIBPATH, SHLIB_PATH, LIB, INCLUDE,
-	#  LD_LIBRARY_PATH_32, LD_LIBRARY_PATH_64).
-	# Maybe there is a better location for doing this ...? Feel free to move
-	# it there if you want to.
-
-	cat > "${T}"/00-gcc-paths.sh <<- _EOF
-		#!/bin/env bash
-		# GCC specific variables
-		unset GCC_SPECS GCC_EXEC_PREFIX
-		# include path variables
-		unset CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH INCLUDE
-		# library path variables
-		unset LIBRARY_PATH LD_LIBRARY_PATH LIBPATH SHLIB_PATH LIB LD_LIBRARY_PATH_32 LD_LIBRARY_PATH_64
-	_EOF
-
-	insinto /etc/profile.d
-	doins "${T}"/00-gcc-paths.sh
-}

diff --git a/sys-devel/gcc/gcc-4.7.3-r1.ebuild b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
deleted file mode 100644
index 7b804b403e..0000000000
--- a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3-r1.ebuild,v 1.16 2014/01/19 01:51:34 dirtyepic Exp $
-
-EAPI="5"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.5.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm
-# uclibc need tls and nptl support for SSP support"
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain flag-o-matic
-
-DESCRIPTION="The GNU Compiler Collection."
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.18 )"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-	# Fedora/RedHat ships glibc-2.15+ with some nasty warnings that cause
-	# configure checks for most system headers to fail, resulting in bugs
-	# compiling e.g. gcc itself, bug #433333
-	if [[ -e /usr/include/features.h ]] ; then
-		grep -qF "_FORTIFY_SOURCE requires compiling with optimization" \
-			/usr/include/features.h && \
-				EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	# drop the x32 stuff once 4.7 goes stable
-	if [[ ${CTARGET} != x86_64* ]] || ! has x32 $(get_all_abis TARGET) ; then
-		EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60221
-	epatch "${FILESDIR}"/gcc-4.7.2-cleanup-empty-eh-o0.patch
-
-	# make sure solaris-x64 doesn't misdetect tls support, bug #505446
-	epatch "${FILESDIR}"/4.7.2/solaris-x64-tls-gnu-as.patch
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/4.7.1/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.7.2-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-}
-
-src_configure() {
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			EXTRA_ECONF="${EXTRA_ECONF} --with-gnu-ld --with-gnu-as"
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			EXTRA_ECONF="${EXTRA_ECONF} --enable-multilib"
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				tc-export CC CXX
-				CC="${CC} -m32"
-				CXX="${CC} -m32"
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is ways too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure
-}
-
-src_install() {
-	toolchain_src_install
-
-	# create a small profile.d script, unsetting some of the bad
-	# environment variables that the sustem could set from the outside.
-	# (GCC_SPECS, GCC_EXEC_PREFIX, CPATH, LIBRARY_PATH, LD_LIBRARY_PATH,
-	#  C_INCLUDE_PATH, CPLUS_INCLUDE_PATH, LIBPATH, SHLIB_PATH, LIB, INCLUDE,
-	#  LD_LIBRARY_PATH_32, LD_LIBRARY_PATH_64).
-	# Maybe there is a better location for doing this ...? Feel free to move
-	# it there if you want to.
-
-	cat > "${T}"/00-gcc-paths.sh <<- _EOF
-		#!/bin/env bash
-		# GCC specific variables
-		unset GCC_SPECS GCC_EXEC_PREFIX
-		# include path variables
-		unset CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH INCLUDE
-		# library path variables
-		unset LIBRARY_PATH LD_LIBRARY_PATH LIBPATH SHLIB_PATH LIB LD_LIBRARY_PATH_32 LD_LIBRARY_PATH_64
-	_EOF
-
-	insinto /etc/profile.d
-	doins "${T}"/00-gcc-paths.sh
-
-}

diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
deleted file mode 100644
index 96b1a6dcfa..0000000000
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.2"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-	# Fedora/RedHat ships glibc-2.15+ with some nasty warnings that cause
-	# configure checks for most system headers to fail, resulting in bugs
-	# compiling e.g. gcc itself, bug #433333
-	if [[ -e /usr/include/features.h ]] ; then
-		grep -qF "_FORTIFY_SOURCE requires compiling with optimization" \
-			/usr/include/features.h && \
-				EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure solaris-x64 doesn't misdetect tls support, bug #505446
-	epatch "${FILESDIR}"/4.7.2/solaris-x64-tls-gnu-as.patch
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/4.7.1/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as )
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is ways too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
deleted file mode 100644
index 87b7195f5f..0000000000
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-	# Fedora/RedHat ships glibc-2.15+ with some nasty warnings that cause
-	# configure checks for most system headers to fail, resulting in bugs
-	# compiling e.g. gcc itself, bug #433333
-	if [[ -e /usr/include/features.h ]] ; then
-		grep -qF "_FORTIFY_SOURCE requires compiling with optimization" \
-			/usr/include/features.h && \
-				EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as )
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is ways too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
deleted file mode 100644
index 81cd232418..0000000000
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.8"
-UCLIBC_VER="1.0"
-CYGWINPORTS_GITREV="f44d762eb3551ea0d81aa8e4b428bcb7caabb628" # gcc-5.3.0-3
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )
-"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.8 ) )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-	# Fedora/RedHat ships glibc-2.15+ with some nasty warnings that cause
-	# configure checks for most system headers to fail, resulting in bugs
-	# compiling e.g. gcc itself, bug #433333
-	if [[ -e /usr/include/features.h ]] ; then
-		grep -qF "_FORTIFY_SOURCE requires compiling with optimization" \
-			/usr/include/features.h && \
-				EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-
-	# Apply https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=226138,
-	# upstream shipped since gcc-6.1.0.
-	find libstdc++-v3 -name Makefile.in -exec sed -i -e \
-		'/^AM_CPPFLAGS = \$(GLIBCXX_INCLUDES)$/s/$/ $(CPPFLAGS)/p' {} +
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is ways too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-7.4.0.ebuild b/sys-devel/gcc/gcc-7.4.0.ebuild
deleted file mode 100644
index bbd5ce8c5a..0000000000
--- a/sys-devel/gcc/gcc-7.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.1"
-CYGWINPORTS_GITREV="11fa2eec213324d64673ad41358f726f6523667f" # gcc-7.4.0-1
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-			# bug #657522
-			# A bug in configure checks whether -no-pie works, but the
-			# compiler doesn't pass -no-pie onto the linker if -fno-PIE
-			# isn't passed, so the configure check always finds -no-pie
-			# is accepted.  (Likewise, when -fno-PIE is passed, the
-			# compiler passes -no_pie onto the linker.)
-			# Since our linker doesn't grok this, avoid above checks to
-			# be run
-			# NOTE: later ld64 does grok -no_pie, not -no-pie (as checked)
-			export gcc_cv_c_no_fpie=no
-			export gcc_cv_no_pie=no
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-			# Solaris 11 defines this in its headers, but that causes a
-			# mismatch whilst compiling, bug #657514
-			export ac_cv_func_aligned_alloc=no
-			export ac_cv_func_memalign=no
-			export ac_cv_func_posix_memalign=no
-		;;
-		*-cygwin*)
-			# use built-in SSP with Cygwin 2.10
-			# FIXME: --disable-libssp should suffice in GCC 8
-			export gcc_cv_libc_provides_ssp=yes
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is way too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
index 2da9f162cf..a721f4aef0 100644
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 PATCH_VER="1.0"
 CYGWINPORTS_GITREV="0de6b2ae6b6577eb0891a7ca8d551bdfa79bf5e8" # gcc-8.3.0-1

diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 6d345e0357..11485cf4fe 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PATCH_VER="4"
 

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 666aee2a93..b6eef667b0 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -1,44 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <use>
-    <flag name="ada">Build the ADA language (GNAT) frontend</flag>
-    <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
-      (AWT) peer support on top of GTK+</flag>
-    <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag>
-    <flag name="d">Enable support for the D programming language</flag>
-    <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets
-      in gcc (Warning: significantly increases compile time!)</flag>
-    <flag name="gcj">Build the GCJ Java language frontend.</flag>
-    <flag name="go">Build the GCC Go language frontend.</flag>
-    <flag name="graphite">Add support for the framework for loop
-      optimizations based on a polyhedral intermediate representation</flag>
-    <flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation.
-      This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.</flag>
-    <flag name="libssp">Build SSP support into a dedicated library rather than use the
-      code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
-    <flag name="lto">Build using Link Time Optimizations (LTO)</flag>
-    <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
-    <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag>
-    <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag>
-    <flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag>
-    <flag name="objc">Build support for the Objective C code language</flag>
-    <flag name="objc++">Build support for the Objective C++ language</flag>
-    <flag name="objc-gc">Build support for the Objective C code language Garbage
-      Collector</flag>
-    <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
-    <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>
-    <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
-    <remote-id type="sourceforge">dgcc</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="ada">Build the ADA language (GNAT) frontend</flag>
+		<flag name="cet" restrict="&gt;=sys-devel/gcc-10">Enable support for Intel Control Flow Enforcement Technology (CET)</flag>
+		<flag name="d">Enable support for the D programming language</flag>
+		<flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets in gcc (Warning: significantly increases compile time!)</flag>
+		<flag name="go">Build the GCC Go language frontend.</flag>
+		<flag name="graphite">Add support for the framework for loop optimizations based on a polyhedral intermediate representation</flag>
+		<flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation. This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.</flag>
+		<flag name="libssp">Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
+		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
+		<flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
+		<flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag>
+		<flag name="objc">Build support for the Objective C code language</flag>
+		<flag name="objc++">Build support for the Objective C++ language</flag>
+		<flag name="objc-gc">Build support for the Objective C code language Garbage Collector</flag>
+		<flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
+		<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>
+		<remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
+		<remote-id type="sourceforge">dgcc</remote-id>
+	</upstream>
 </pkgmetadata>