gentoo auto-resync : 18:06:2024 - 00:10:02

19 files changed, 6 insertions, 1084 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c0e64f16f3c8..9f3f0f82ae05 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -5,27 +5,16 @@ DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c
 DIST gcc-10.5.0.tar.xz 77846412 BLAKE2B 9b71761f4015649514677784443886e59733ac3845f7dfaa4343f46327d36c08c403c444b9e492b870ac0b3f2e3568f972b7700a0ef05a497fb4066079b3143b SHA512 d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd
 DIST gcc-11-20240111.tar.xz 76240620 BLAKE2B dcf3b2493ca6ba1a9cd0137186cfbf1b96296ff9c5625e40ec7b89e5903b07dc151b61ad54b885fc57ccc02214e2cfa7b9249cbd755ac2554c6ca0008f0704d8 SHA512 aaed094cb6dd99166e0ec59886014108574ddab52701581f0f8e7f0abb966320d01f1bce6ff646170618ca7c2819d20523a23615f20114dbe412de43b937caf4
 DIST gcc-11-20240501.tar.xz 76267628 BLAKE2B 31674f1fbaacac3bc8d4f0553b42569128c978b7153eb867387ff2cedd11ba29e2877a66eefbb41b93745e9ff3da7db18c00aacff5766a34b020cb82252da3a4 SHA512 b4fd43b02ddf60dd933f86813cf4c5e2abf4d3344adcffc4166ad2463b2aa37603eb85df642e952a1c72a6356fc41d80567096ddc4e46d4b4589ade34ae77b2d
-DIST gcc-11-20240515.tar.xz 76271444 BLAKE2B cf7844a31f74ba64240afcab3b4a38aa7e57bc7844b4c9a8f37b0aed59807346e53bd387c0111eba5cc0e461d7afdd89532cf682a43e5984be7dae3ec0df70cd SHA512 e74b029cc62f7d9a59b9fe3cb18ab8f17dd583aee786ca7f264dab3a98992b6d3e6a194ebd8b58e0bac960142ce76e5317990695fda8b08629fed82864d8964b
-DIST gcc-11-20240522.tar.xz 76266872 BLAKE2B d01569464aabcc7f5cc365bba5176c14d6f406ae69649903b214294d54fc640ebd9073b53796a29399574d0a245ae3dc830346c6c00f36394a63a02fba368de2 SHA512 d9f9277874bf9f40b584a66205c4a58464cbd5bf2884892a0fc057392a3fba6f8b1aa37a23f639d595728b21b3f46a3a5939e72ab75314a23bed7fc2c143a328
-DIST gcc-11-20240529.tar.xz 76268860 BLAKE2B 351b4df815d19e918932c45688ffae5ef5d921bcee9d6fcf53a8bb495194618a1597585e543093a4107e4616edf16d6e241e478f67c02f9933ffce201641576e SHA512 8d5d120f545de2a56883b50441dfe49211b90c26d87986af1afd4f60970c00dfdd645f65f9b69a01f014c227fa1c2cd4b3ac46157d236e6917aaacd477d4ec7c
-DIST gcc-11-20240605.tar.xz 76281596 BLAKE2B f102df5a47a76ab6e3d8a8ca7605aa7fc0cb19f00423473bd63f6f9f916b282c9e1d5b7c7ea821543e92a230b305b02e4bc61b4d1bdef652f0bbf8229735a248 SHA512 e493287c07775c7d70611b264760a05025a30df2069fa369303851b49bd0cccebf0cfd5e08651251935fbc241a36be12c9a924524e23aa01519992eab67b6d28
 DIST gcc-11-20240612.tar.xz 76291200 BLAKE2B 150e7e8fd3f5d9748a68c548985261696b375650117a9dc656c715aca9cb6923bd7621d3e5769118759b9ab58f13729013be48723ae4b3caf7f574d22d5a1805 SHA512 61f760a29e6a0f183eac0ee8443b6f44d2b5e7d256b3c4b5c3a25ef930c2541803f7cca8b48ee34d780616b00f7e8f616cc6355e3ef49d806d686e93d5a4d6f9
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-12.tar.xz 13824 BLAKE2B e4df9e0dc9512882022aaf325ebf65c540169454c91dd31f913c6f57f6eb291c79ae919671b53db1549799d4a70c09298bf45ed82ad05eb1f961443cc958369d SHA512 87fed0c3f8e28c9f702443db58350bb615110b27ebe334b5de2ea60678e2548c56cd75cffade210d69634e2ac0a9311f5100ddb45d97645aa76d5688bc421a61
 DIST gcc-12-20240209.tar.xz 79824868 BLAKE2B 1ae5a646da470f06648c4766c77475ceb287c5f6647d5102f1aef6590f973233d5e7f83b5e0241488d49dba59dd605c211938379e68a393a2dccb3834103ae4b SHA512 9f9a04f4477f41bb2a5662aedef2af75b039de50c2dc99310e504e6080cb7aae06a1255337ea2e563975cb108ddc6766adbbaf4e3d5d5712801d7ba9a5209dbd
 DIST gcc-12-20240502.tar.xz 79851984 BLAKE2B e3ed4f4fb20ce2ed421fadd40dfd1c6831759228925002146c316683cd0aef47792f433dc9ab120fb79e2afa2aa83cbf68f6b82e97615cac500322d4f0d1cce9 SHA512 c46e6b00f65d96afc65ce6cc9f7591ff81d5789aff9f49fc6fed96047fe27e24a8a103f0b96485e4a717600aeb9b45933ccbb2191eb087275fc1350629c9b842
-DIST gcc-12-20240516.tar.xz 79851552 BLAKE2B 0ae06aa8b15be704863648bd2dffd183e5c231f1d760751e28d3aa3bfe2b18443fc7af5e176becc3d4d4c9831ce3a99e3094dcb9312bd22cb888ecbf16e135c3 SHA512 7cc60cb6f6449ac06ac0da271418506a6c05bf874fa460e471b4c3b3fc2d2a978a5340024cc82df886f5b7e31e4ff2322cba313ff922638ed9259a722725c3a8
-DIST gcc-12-20240523.tar.xz 79858692 BLAKE2B fbe5ff714252f9905610ddf48896059c2c2b7e2b672a00e5cd24e6830d304a9889615d756c42be7fe5383f3e680174e3c0db7be759bbaca9c770f7c66c8f1923 SHA512 8d079cca2ab597eb3190e4b921890d92d652fee7cec69b3aae64d388e753e0b8b4e15492c5ed59a9be1f38451029e5b52567ecb2370ac2f39257dd42b25bf637
-DIST gcc-12-20240530.tar.xz 79864712 BLAKE2B 766af7d9cb4a7db80b246d36097914193cb774766e38b182a2dee9ea5fa54cccc1962b272c374ce050b34ebeee52e1e1259f4880d5ee9f534c9c78e93376f358 SHA512 dbcfbe933b78b65605d28d959dc7557590823e1d3739bd4ff6cdf3d6e89b42d46ccb062270ebefc627272baf021f11a79587e981bcf64931323219a37afcb78c
-DIST gcc-12-20240606.tar.xz 79866660 BLAKE2B 4b9e4564ea3a1b5fea4171803fdf9601fd0b5e1e8c20b1ceb41b1355911e3518b49254f561dee3db5f946ff589a132908f945e0f6133a9030e9849d15e3b57de SHA512 a9354ab4c85057ab627d8b04cd9d918fc744bf84916a55e53a2031ca7942c5fd02aeaa448777b6b14c6f511e8b3c154d78f3a6d34149846c1b18ed5d47add4d5
 DIST gcc-12-20240613.tar.xz 79875076 BLAKE2B 48b57f834df842c72e08dc9ae3637fdc5fb381f0f50a045a43ff3003271b7e8fa3c92a420447911a71df1184b25c2aad084d80bef8194a6468ddc21b1730b69e SHA512 1d149f6347f314a414bb279e20ae48bea2c9baa03257e3636515a74b389065a7cb6e5257f62334a307ebf6ef7ff142362e69967acc33b92a7fe21eea2bd52ee5
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76 SHA512 aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb
 DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d SHA512 14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f
 DIST gcc-13-20240503.tar.xz 84417232 BLAKE2B 4024852c3252667054e6086263b2a0e21dfa1e56a7adf4edb2fee4841dc2b41eb3f02dee7b15c5de3a1ac7c438929da4ca584cab07724086f6eb315a331c4a44 SHA512 32b74972ba94d1016e052eb7c7dc976b32d679e40aeafb406bbbc69d34ade3fe0f35d8941ef678eaf0bb33aea1aaba8fbce9122733b12920a470763a18aa6514
-DIST gcc-13-20240524.tar.xz 84442852 BLAKE2B 71b4d84b73c122a25db4eaacdd07d9f6920951d1daefae353c060d2360f1614c9e465df404e2ad30f5595d9d25a8ac87d5f481fb619a1fb8aae460d3c990252d SHA512 02e2dfb2a03e9e5d5973781e3556ddcc36861285c7c4dc8b82cde420ef34e322eb206f89cc81aad2c3e932d9e0e3565efbcc1f065971e997e730c75fbaad91a1
-DIST gcc-13-20240531.tar.xz 84452600 BLAKE2B bf0938328073073d9876cfccd54ee12e60e99a8cf159457825b104a70ef7d09537e40b4f1a2f09a3b5420c3c01facb9151d7e8f595d58d594b9d5cec2f06b552 SHA512 404b44f8073eadb80e781ee9ef5d3709f83ac7c43d6a703b8df81f30201c7c88b837019b961b0d71c6dcd7f83fb5b2c087d7e561748e50dca10e3116159dbda1
-DIST gcc-13-20240607.tar.xz 84516980 BLAKE2B 0b00dc4b4c1b5a72cb935cbd854d618e18bfd92b48b70dfb69d7b7cc509871a5400bbeb656a22cd02fe37eda52d27206a7fb3f32bae8a761716ebad5bb320325 SHA512 414849323c42934b958f871b30a517e7db097c538185bebbb584ba17ea1b40a42bc002f5fab88df8900fa4c8fa89028cc8bca7db31e1e1370109ba2ab64e0bdd
 DIST gcc-13-20240614.tar.xz 84463660 BLAKE2B a1b551ff633c31d6972fed173f248ba5f6696eb1566801e180b78a7c7e20933b1aaae40839b4f1529d61166de55125395d4f9a812511c088e73f975bf1d2167f SHA512 1a543ddfb56e793367a43895a7ce4f97daeca6ffd5234ce50e8a7ae0f8db1071e01bdd653fda40d00eb7a680faead8f1d8d1295f983086a33a4c75e4affa2ea5
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
@@ -34,21 +23,16 @@ DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249
 DIST gcc-13.2.0-patches-17.tar.xz 45036 BLAKE2B 85fe5e6b0da7a4477f0026aaf397d93421503780ef3c91e0a5e3c6897ab73884d4fbc9d2f5f41ce3f3f172fa7eb98e45c348ce41d852457c472360eb2e48691c SHA512 ebe77a32af38df15bc4034e88fb6e90c84b3c0a172d854cabef789cc29bedba14ec0c27fbeae0959027587e02bc882a944ef68a1bb471432d021d11b4b037562
 DIST gcc-13.3.0.tar.xz 87909952 BLAKE2B 0f3728b026bd8aab0e469dda54facf157a4b753d3405a74b0be6105a6e3a493d26df4007d90ae4e05d86277d41873312638f9589d1757cee80ca84de7f2099e3 SHA512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
 DIST gcc-14-20240518.tar.xz 87946040 BLAKE2B 83e567d680b1463cc672fb461aa180cf46555911f0e91a3fb89b11fe8b81d12d64b3a3419953849cf2deb38f1cdf0defc05169c145964f74c1105d942b5519f9 SHA512 73dae806add90e8b3cdfe1c56754ae886f6f6150ef4ef217664b48507ff19d20933648bb6a19ab62756146e83e4df037ced30e4504d562966c40b3750475f28f
-DIST gcc-14-20240525.tar.xz 87961136 BLAKE2B 89898dfb5ce7e135f02e88e476df6aa48d7f809ac695328d51d1dc8deec89537c0da80d542a0063d718aad45f10fc192d2540caeb0ba8f6aa61a88410de47166 SHA512 ad4a3ada606df91836a145b9b78d96251760a42ff6c879a558a16889f708aca3626dfbb2abbaff3c87107ea17a088a216dbe139399bd766ba8bb0b9231285f1c
-DIST gcc-14-20240601.tar.xz 87970588 BLAKE2B bd2ac4252b1fc7173bad17116249f66559a894888b844e41e3502cb370a3571ae5736e1a733d291656e16e753f80d77fc4c7377882eaea24035e63712f2609ce SHA512 ac8db89eef701f54b57581808833817d4c27e07e23a80d83f5a597003ae34297d22c7da807ea68985ae79f487b91f1fbc8d43b0e70864da2c0df8a8ceb800e52
-DIST gcc-14-20240608.tar.xz 87975596 BLAKE2B 0c86e6c5d1153151e64d77c9cf44f14b668b4605bc516b38eaa0d559d0eaf4f3bf986cd8cd6006c6af0451fca847ee16f51dd99db36dd77a44f4ab3a66665679 SHA512 e666a3d720b34ed255018ac03823a1261935a742f6e6dbddb074961eb5e6b05d3dbd3e3fecf8f9883598e532d28c867d60803589f51baaaa9cd34220e1a40e65
 DIST gcc-14-20240615.tar.xz 87972240 BLAKE2B 19b8ed044595393c507ed8b9c6a4a4fde0cf6bc1647f16bdd73e9190303a7bd8441602d73ffeeb75e5232113010a30b8ea848691befd21de5a591c9d56a398b7 SHA512 d8d757cfbedb7342443ce8de4439653537c46d25e552d88cea0ba9f7aa43ad14fb2b42a32a1dce5ae4eb2ac3849024f6b4e700f2c39330a00a65caa3f5fe29e7
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-1.tar.xz 11584 BLAKE2B d483f4e3324acdc26b9837028d5e20ad0cdcf3ef4bcc78a6902d63ceebc7e5ff70c8163f6a8c8e36405df47c59dd2df506147c53ce51a8ec73494e65b5902647 SHA512 3d7aea113b594d1896c93e9e6be85f467488fa75de2800ed76eab2f87cef26829b235d1f361b187e38cf13b0fb9518cd4431c3106ec1e49d0f744e7eb703eaa0
 DIST gcc-14.1.0-patches-2.tar.xz 11400 BLAKE2B 8698d9521b193a03df20b68b70bc8d2dc083e246542d95e510b86f152a4d13818162985d4728d87f74be784870595a238d195f617427ec0905919cce0ed23476 SHA512 17e97aec43dea0c131fc6c829d05b7ab56d3164a7d79715f08f54cc2cff81747d1554ca2644edcc1cbd7db3d87dba6a1c2fb71896950bd9b54c4c5c10daa3e7f
-DIST gcc-15-20240519.tar.xz 88058724 BLAKE2B b9a9a93132fac8f827cd9f293fa09a4705084a420072da27161792a9c5f84a8fc9f28b15e878a5e7872579d4e89ae2e383b025d0529cf9e11c7f87454d61d62f SHA512 00eaf263d3eafb8b1ff101d703d9d82a770a79dd5484a6e69adb53889313ad300b65ac5159564950921985178546475cc26d760395ca68b4a6d4433ff26a6ffc
-DIST gcc-15-20240526.tar.xz 88091872 BLAKE2B 71bc733910cd334227ea0b78770bec9b4253b04ae7673c8f48e92c8c3322ecb2c4169b0d15df7a2f8fb222fed379c84fcec632d211e6aad815b56442ce28e9fb SHA512 65b948026bd558d5e2c70f76f62a4676bcd37d4d1201871f473d7f0ee32faa2614bd64f52090565c46e310032c743328f6182db97de874556c872f4ec0ff2ec2
-DIST gcc-15-20240602.tar.xz 88177484 BLAKE2B e3998b5608e4d6d7fed79aa41ee8dafb7165da3203823dcddb79c2548b4356900153e2135e42794eeb7097f2888b5988b7fd451ae1436b2f41fa227f1c59745f SHA512 dc9479f4171daff51a2df55cf907efcdcf02d4d91bbb50a7e1e5c64232ebd640ab424558fe8c3df50e70421b336ca66b1b02e0b59d5e3d07a13e1c97cee7b696
 DIST gcc-15-20240609.tar.xz 88288628 BLAKE2B 25ee6b2071fd189d5099160a1b9594cd0cdf6075a733258a61c3586f043d65a3e8ec22f1c2084c50694008d647ffa43895ed58dc655c41f296b98d136951c57a SHA512 058fae65f7cd398cff43282b9697497dead93401a7da47e63561bf029284b4b890f57f2ec74ef7e3ce7d170a2e69dfd5090b6465029360ab872222db037a9127
+DIST gcc-15-20240616.tar.xz 88348980 BLAKE2B 3b2cc25b55167e371687b7325de14f088cda4cef72566ffcb243cfd7584234e60fe0fa69a3b70eccd02e30dff3980ab76507fdc9003195ba806ced2aef4feade SHA512 f5ce6785f3dc17493945e48787274ce338b32e7bce95f94b17bc28ce680eb092067d065843202e1449179da09ec3b23246d7a3aa6fc61cce3cce96e1e7ba576f
 DIST gcc-15.0.0-musl-patches-1.tar.xz 3596 BLAKE2B 48fddc723ec8282cc2704c795a50fb37a46738a555151e0430180dda61d039fe96b29a6c3e8a543386d69690302bf46dfc89aad572082b7e47c928c0ccefdeb0 SHA512 e43284d02e25b77b911ce90d57520897751e86c631bdd6beb7d2e4429000156801b8c11bd9a737ec11bc966812f13ae44b88c1893645f8e6c6f8dfddc636ec39
-DIST gcc-15.0.0-patches-1.tar.xz 11588 BLAKE2B 0623914dcf3ee0d44c729776cebbecfe92b256039a48c91e3fc16a27254a9c40436a1b6ea7fa9285914b153af861ea98ab845515169af204eeea0243c890a652 SHA512 7d3bcb1adcfa79c1672737125539fc0583f9c74eb8da0301ea0e441c68afeb7e1dbcbdffbf18e03b2515b4f23822a39e339298cf88ea94b93f5fc22b497cd545
-DIST gcc-15.0.0-patches-2.tar.xz 11404 BLAKE2B e7caba8101e55ed59b8e18a6f062c699081eb764bab40c39dcc70c058002773b36d551ef8d5b1c35bf68bfe2f5b6917b0fc4b7d647a6fcf0d6b321cec7ac0185 SHA512 41d900ded125702cefdb0ec6688137b63209db7f26bb812207df987c26de64dd1f63d6513632b33ef60ae1e3b0349512611218eff2f80f9a5ac88fcff3e29354
+DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
 DIST gcc-15.0.0-patches-3.tar.xz 15668 BLAKE2B 99c332c7302bba0a790192bfcd81b8a273002884a2a89fc03f61d46ef669d9ba49496806400f86131c127b960862b97296148b6a0956946cc98470397c02579e SHA512 f0effdadff0fc553835c13f0dedb903374f021d172a20f01e6e3e0a39495ead96229665ba1a82f0aa1e9b49c6ff367f5c6e2c3e336a84ca02efb96f1a373f18a
+DIST gcc-15.0.0-patches-4.tar.xz 11440 BLAKE2B 8b7379f91ac14dd1e496de744d221cb0ba1802c14ce32cb90e6311ca7a60cbaf488a57060673e2e9d407eed6d3c5b092c1ba6da27036d35e0c78a7ac8a5f5ec4 SHA512 92e8895ec1c6054b46581867f3e49bd2d574043ae82ca441e2b48d9ed0e2dd5c58baa53ba605ce59a5c1d59473ac0d79c0287e5b47d06f0a661c655a19a4a5df
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
@@ -57,39 +41,22 @@ DIST gcc-validate-failures-a447cd6dee206facb66720bdacf0c765a8b09f33.py 27537 BLA
 EBUILD gcc-10.5.0.ebuild 1433 BLAKE2B da4a4ebe9b3289302ed6841fe5223304a54bd74518a27efcd9350718b72737152a52afcec146cecf51076d492f000937b93e3fd771c31e527e5fea9733c8db42 SHA512 8028e212230da68828c211adb91f217a2fd4c526a2307cb23cd0a14c8373c5f87530849051e5bb5f7f66028f948a9085fea980c0a0b3706d929ba1d19c8f3f9e
 EBUILD gcc-11.4.1_p20240111.ebuild 1652 BLAKE2B 38ca91410663a80cb9c7445fa6b727180c0fc76237274d1769376f3e9622012b40abb52fd78c8452471c2be8f9b9ef48707ec802b983a633c24179cd4c152cc0 SHA512 c9960ab183cb7e18f9e7f5066fb1db0ce2309fff609d2188ccf1a92789c8ba6638654d7ef4ffda4883c0dc3066c6882c58e751b7ceb1313bfbbdfc837f3636ad
 EBUILD gcc-11.4.1_p20240501.ebuild 1660 BLAKE2B 3d2872f12a3494dfd78fab2fa770600089345fb10be6923a355b93a59e2d91db2c6c77d1c6f2b5b3ea0d5efe872b57a6a984c800c1ab3e0f32f710a974dfa2ad SHA512 c9812c3168e2c60c129d35ebbaedd98bef5916550ccad96aea54c74e942503dcbf167aa84d431dad383c95a1b692df94678b791f9246bd6ef6b22576fbb62dd6
-EBUILD gcc-11.4.1_p20240515.ebuild 1661 BLAKE2B 664e31533717bd2d493b37406d33fb2440ece1851bcd65153b8667f4cb5d5929d951d06f588915da62fc004697922c59905c53c83370597a76b0a2fa50b158f0 SHA512 591dc70c783d3d829bbc972620e5f664cf9b262ba554738b08db34255528f13fd83cd3ca9e5e33a49fc69ba705538265cce579365b860de538e2cb82d3a4ccea
-EBUILD gcc-11.4.1_p20240522.ebuild 1661 BLAKE2B 664e31533717bd2d493b37406d33fb2440ece1851bcd65153b8667f4cb5d5929d951d06f588915da62fc004697922c59905c53c83370597a76b0a2fa50b158f0 SHA512 591dc70c783d3d829bbc972620e5f664cf9b262ba554738b08db34255528f13fd83cd3ca9e5e33a49fc69ba705538265cce579365b860de538e2cb82d3a4ccea
-EBUILD gcc-11.4.1_p20240529.ebuild 1661 BLAKE2B 664e31533717bd2d493b37406d33fb2440ece1851bcd65153b8667f4cb5d5929d951d06f588915da62fc004697922c59905c53c83370597a76b0a2fa50b158f0 SHA512 591dc70c783d3d829bbc972620e5f664cf9b262ba554738b08db34255528f13fd83cd3ca9e5e33a49fc69ba705538265cce579365b860de538e2cb82d3a4ccea
-EBUILD gcc-11.4.1_p20240605.ebuild 1661 BLAKE2B 664e31533717bd2d493b37406d33fb2440ece1851bcd65153b8667f4cb5d5929d951d06f588915da62fc004697922c59905c53c83370597a76b0a2fa50b158f0 SHA512 591dc70c783d3d829bbc972620e5f664cf9b262ba554738b08db34255528f13fd83cd3ca9e5e33a49fc69ba705538265cce579365b860de538e2cb82d3a4ccea
 EBUILD gcc-11.4.1_p20240612.ebuild 1661 BLAKE2B 664e31533717bd2d493b37406d33fb2440ece1851bcd65153b8667f4cb5d5929d951d06f588915da62fc004697922c59905c53c83370597a76b0a2fa50b158f0 SHA512 591dc70c783d3d829bbc972620e5f664cf9b262ba554738b08db34255528f13fd83cd3ca9e5e33a49fc69ba705538265cce579365b860de538e2cb82d3a4ccea
 EBUILD gcc-11.5.9999.ebuild 1628 BLAKE2B 41e0f72bf9a572d576b6a5b53094af61e3053dffebbce05fe8cc92352735311256f9761573466388a81ac80f1a6d6131f7850c26941a6b19a82e8f4eb858957d SHA512 134baafc9ede870c490d089f668e37e4df052aa1af6e6651d2da484ce91141f6654548b9e74b1dde408acd01380cc3f6fa0a0f33e9616cc1ca2425032f1543c1
 EBUILD gcc-12.3.1_p20240209.ebuild 1658 BLAKE2B 5e45b6a4d489f0719474fe44f6f4ce3a71a5c5127cef4bc7f7251909eefdc634260e2e4e2bde67ca679ac4d2d1c658406972d5ee557db1101404f925c0da3611 SHA512 9e8853c3ebcd411e53dd7879944c37419355b7ace602f35e1b74916e8dcfee6c4a9dd15438422f66305d3c481fcc7718a2cfb29e024edd0eb37e649e9fc6a217
 EBUILD gcc-12.3.1_p20240502.ebuild 1666 BLAKE2B f01943920ce5eb15d825539492a60e2d9ed69358833a4c2f5717334c39152c4ca47db8b1b213e17e358031912c886b21c7c0c03688bdc8d77d37052b45c4bff9 SHA512 65c3d11a21a251a8dbc899f37af0aca361ae41486db40dd19db1588373f599f5a87933e8190d573d3fac523771a7e1910058c352e563f434603fc7b52e7dfd33
-EBUILD gcc-12.3.1_p20240516.ebuild 1667 BLAKE2B feb14aa36ffdcc357862df79af07cf674ababd61b15a1085c8b924c5874ec771379b435572762a8a8582e80f9ac3b6087fc1ca734d3fb2b9aa1d1ca9a2660717 SHA512 b9209208815aee967f0d720f05cdd2674859c57ba73917033f11dd9f79dcf615e503ad0e68c65ab1a3d3f43f4514edb7724c64eea137cbb093c13a6b607b935d
-EBUILD gcc-12.3.1_p20240523.ebuild 1667 BLAKE2B feb14aa36ffdcc357862df79af07cf674ababd61b15a1085c8b924c5874ec771379b435572762a8a8582e80f9ac3b6087fc1ca734d3fb2b9aa1d1ca9a2660717 SHA512 b9209208815aee967f0d720f05cdd2674859c57ba73917033f11dd9f79dcf615e503ad0e68c65ab1a3d3f43f4514edb7724c64eea137cbb093c13a6b607b935d
-EBUILD gcc-12.3.1_p20240530.ebuild 1667 BLAKE2B feb14aa36ffdcc357862df79af07cf674ababd61b15a1085c8b924c5874ec771379b435572762a8a8582e80f9ac3b6087fc1ca734d3fb2b9aa1d1ca9a2660717 SHA512 b9209208815aee967f0d720f05cdd2674859c57ba73917033f11dd9f79dcf615e503ad0e68c65ab1a3d3f43f4514edb7724c64eea137cbb093c13a6b607b935d
-EBUILD gcc-12.3.1_p20240606.ebuild 1667 BLAKE2B feb14aa36ffdcc357862df79af07cf674ababd61b15a1085c8b924c5874ec771379b435572762a8a8582e80f9ac3b6087fc1ca734d3fb2b9aa1d1ca9a2660717 SHA512 b9209208815aee967f0d720f05cdd2674859c57ba73917033f11dd9f79dcf615e503ad0e68c65ab1a3d3f43f4514edb7724c64eea137cbb093c13a6b607b935d
 EBUILD gcc-12.3.1_p20240613.ebuild 1667 BLAKE2B feb14aa36ffdcc357862df79af07cf674ababd61b15a1085c8b924c5874ec771379b435572762a8a8582e80f9ac3b6087fc1ca734d3fb2b9aa1d1ca9a2660717 SHA512 b9209208815aee967f0d720f05cdd2674859c57ba73917033f11dd9f79dcf615e503ad0e68c65ab1a3d3f43f4514edb7724c64eea137cbb093c13a6b607b935d
 EBUILD gcc-12.4.9999.ebuild 1635 BLAKE2B 3af833a998966e089c6db5df1e40733ddf2d181cdcd8f68b6df0fd7db70a3d4b65c1dd7c4edcecbdb97dda959bd7de2dd2fef6502a5ce563f20e525f767ac045 SHA512 59629d13518708f70844d7795bfeb7144d1562ce61d90b666acb41953bf56a368a16471795bce2b6d54a058b3919fcef58b0e60d4b0a89f5e954f9f6b26514e9
 EBUILD gcc-13.2.1_p20240210.ebuild 1718 BLAKE2B 3955dddeac163ab623486dc29bb6442df10aa777385f18ab94db94153fe7d703fdff3a262e71f863d77833763221ba9141fa6fafcc62e33196d206dbf9c245b4 SHA512 e170a54a7c98222dfb420bf0b0eea192adcad207c982cb4a499ccdc55f19c05730673ed31b6d3ff7579a01761f4610a3f5f592e264f0ddcb7e3c3a0c6606284e
 EBUILD gcc-13.2.1_p20240503.ebuild 1726 BLAKE2B 381a6cd5d60a1e4ac9016198f69d1910ece06c90a42fae257076bb996a602e7abe0a22ce3a54ee44fa556ee2b8f2aa01c54d113ba2be7694b2e67356dedfb213 SHA512 cc5789f2c17046e15ea1063102db13b58be0f63460e2ed284983c487c7e131b05daf1d26a59d8f337409552b8622e04db8d4a7735587d951235ec64438194316
 EBUILD gcc-13.3.0.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
-EBUILD gcc-13.3.1_p20240524.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a262466db69a4a3cde6fd51b0e9043dabcee3c0ec80ef027d5b8c7c8e57cf98152e8bddcf3a16766be5b70299cb6c53bf5c SHA512 8c5bf7c53185492760fb23fc5b656b59820bb9a1a4f607f76cb4d1392b096de2142b65ab035b5a5e40d48ffa7d641b563ee9a1a2f1343ff8eed6658f60f5f97d
-EBUILD gcc-13.3.1_p20240531.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a262466db69a4a3cde6fd51b0e9043dabcee3c0ec80ef027d5b8c7c8e57cf98152e8bddcf3a16766be5b70299cb6c53bf5c SHA512 8c5bf7c53185492760fb23fc5b656b59820bb9a1a4f607f76cb4d1392b096de2142b65ab035b5a5e40d48ffa7d641b563ee9a1a2f1343ff8eed6658f60f5f97d
-EBUILD gcc-13.3.1_p20240607.ebuild 1727 BLAKE2B aa1facd891b7a0beec4abf49d2ce1a61755efe3d4661d3c4ebb6831dc795b75742a43a8de59b89121d2d3c0a3bdf056cb7919bb463cf4c7eeb1bc77144cc3465 SHA512 6fb736e47d67fd3207994c7c463b240b8a107b427e493baecc188b42bba727019b8fdd6947f47bbd74c7477dbd956a5c7dd42801571c1492099a601b4cf98839
 EBUILD gcc-13.3.1_p20240614.ebuild 1726 BLAKE2B f30ed39390340ce8b3c2f938bc7863012a490056392405e71e9e4f8c42bdd48a438a653799cb3c99e5bf27bca3c271814e5c1ef7d2b67aca68cce236e898ff2d SHA512 87e9292117cea0b2ee15cbc010f0e49e7f66f1f5be89da84f7fc2de19953ded5b4508a4ee5e6777872ad0f1d10874ea636fdbb70b2375c7ed92fea0ac19cc310
 EBUILD gcc-13.4.9999.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
 EBUILD gcc-14.1.1_p20240518.ebuild 1619 BLAKE2B 45cf6627b223638287177489e67c70cbcb09bedacefcadbe0165c05270ee2d56459fe9bc1d209e84ebb9470a038ec75c7e57881bd7e202ae0aae66ef94bc3b98 SHA512 2ab7c3c0d46b690e60ebaa3582b71cc3b0cd7930767888699825674b82e680dddcb4ff40552ad77c9c1d576f21ad98e6255b46cf6e7dc21f10252f8a73db9308
-EBUILD gcc-14.1.1_p20240525.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
-EBUILD gcc-14.1.1_p20240601.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
-EBUILD gcc-14.1.1_p20240608.ebuild 1620 BLAKE2B a9648fcc78b48e7fd117cc73761764c294129bfbdc0e3b19d2efbf27923bd3d87255b718bedfb13af43e9eca7c50220a9eed346410095023db8bc7360ddc145c SHA512 c8dcc13b197e6893d188c9bce84e81b6e797b60ec46e3c55d23be00592f8915705807c2db97eebc538a6cd27675d3c1cf2406e8b79f1fedb230d6ed6335e7dd0
 EBUILD gcc-14.1.1_p20240615.ebuild 1619 BLAKE2B 9d9c1e1af0c2f08691774a2fcb48edc120d951db0a58c43be559c9b812e30fd4b760fca23a1f0305db56c4c3542a8ce1347b25d292a263c46e9e0074528efe2b SHA512 6daf55a2f13c758d807fa9a9b29c9973fa927a2c1572fd2a259c3e60150daa7d0b6ea76796c95866313c04322669a40501e6e65f236547224affeb0d43e821ed
 EBUILD gcc-14.1.9999.ebuild 1453 BLAKE2B caee7ba2e0323b0953b53c822cfe76c70eebd466d80575612ae6daffdfbdb663266a9272691b33c4396bf8c70c81cf3c64035d9c5159f1ba9ed1e231ce739c1f SHA512 b1cc3de6f9f03b6e6558824cec9c19c8b4c424c769f8d02c0675c20f6c687b2ac27fb8d19646feb221570611e35248b8c22334b9207d27c401a5c34a54e34652
-EBUILD gcc-15.0.0_pre20240519.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
-EBUILD gcc-15.0.0_pre20240526.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
-EBUILD gcc-15.0.0_pre20240602.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240609-r1.ebuild 1402 BLAKE2B 773dde45ccecbf9f0645b184d3f8200c2b6876ed11aaeda3e616889c4a5fc44db1a76bc640cfe4fbff094ccb93d2c89130baf4bb053cff25e794eceb88d95682 SHA512 1b2a9b20806a57fd90ff8a100c393586b70dbc308d825823c9c680c62a2334d2716678f2a6faee1f11044e8f6a7c0f4617d1bfd8b98a49c0e257f2dbe6ffecfd
-EBUILD gcc-15.0.0_pre20240609.ebuild 1402 BLAKE2B 78b10af75acdcb02a0a0c37af400a1646256255e1d14530660594c59e5a4ac1f7fc1c7600ec83a8046f1e998137b6b0f16713dd23aca5ed3639ad92b963f07a7 SHA512 4ed135bb568f679238173262c545781b8e402aea8983619c656fa6ba73cfecb0fdfd52b8b29e38de6ccb07998fb6839b4dc6debe5d36118c348ef8c50cfa0c21
+EBUILD gcc-15.0.0_pre20240616.ebuild 1402 BLAKE2B 1eda966164b7979272b3be8edc7b30752c4aae2524824a2a53476d7b8e711a01f5c4f9aee5b09f4aa7c8ac43fd9e0b86e5c65dd37b8467e22eb4f52a916448a4 SHA512 79282351ebb8eeb60202388dcf812d2a41621e175efc72f3a3c8ff923087f7d2d4c8381c2622d036991cdb62b51299985543e97ce270c1712d56357d8df0400f
 EBUILD gcc-15.0.9999.ebuild 1375 BLAKE2B 713f557e8ccda4a146eb0286c1d42c1ccf144937450190dff66be5a280abc345951cd43c563f3a3436cdfa5c9e6a077d59132e3f8f7fc9d472803b8024624abe SHA512 624abe83fbc0654e5f2104fa29499fc26ecdc8d5a923f653981c79f93c982c1f43bb75005b61239bd1fe8490d1cf64afd28a454a5d1bc72c51369cde1656524a
 EBUILD gcc-8.5.0-r1.ebuild 533 BLAKE2B ef3368f7236352e8ddd5b56919cd2145794b0385f35e4efa50808aeafd98687eba5d32264a3fb2a34d85b5d913697e93af58eb03ce35b6b5ba45d78bb8f33d25 SHA512 528e4b7389f4053aa177b8405469963358c5d595fa257115fa94e5e26a54a6c3b1c15bb847bb97864dd387fd2681f16907aecf052fad9315dd91863ac419d10d
 EBUILD gcc-9.5.0.ebuild 1241 BLAKE2B bd30abe9c99e317edcf7ae6ce8626a4c27322deaaadd510f02d0f36422d892eed896cb0ede817c1ee5bd2f5b913f2c426ed2ebb5bb8c2d455a1bbb3531f49eed SHA512 905224e69370a065c1f6b72b568418a231fa47f76085291b4eb3bdab741a64d1e454b02064d2afb4a91c1d935c58e8d299485b33fcc4fef8db3531967f6fb457
diff --git a/sys-devel/gcc/gcc-11.4.1_p20240515.ebuild b/sys-devel/gcc/gcc-11.4.1_p20240515.ebuild
deleted file mode 100644
index 66e7925a44d5..000000000000
--- a/sys-devel/gcc/gcc-11.4.1_p20240515.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-PATCH_VER="12"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.4.1_p20240522.ebuild b/sys-devel/gcc/gcc-11.4.1_p20240522.ebuild
deleted file mode 100644
index 66e7925a44d5..000000000000
--- a/sys-devel/gcc/gcc-11.4.1_p20240522.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-PATCH_VER="12"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.4.1_p20240529.ebuild b/sys-devel/gcc/gcc-11.4.1_p20240529.ebuild
deleted file mode 100644
index 66e7925a44d5..000000000000
--- a/sys-devel/gcc/gcc-11.4.1_p20240529.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-PATCH_VER="12"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.4.1_p20240605.ebuild b/sys-devel/gcc/gcc-11.4.1_p20240605.ebuild
deleted file mode 100644
index 66e7925a44d5..000000000000
--- a/sys-devel/gcc/gcc-11.4.1_p20240605.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-PATCH_VER="12"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20240516.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240516.ebuild
deleted file mode 100644
index 1f38c9fc478d..000000000000
--- a/sys-devel/gcc/gcc-12.3.1_p20240516.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-	        MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20240523.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240523.ebuild
deleted file mode 100644
index 1f38c9fc478d..000000000000
--- a/sys-devel/gcc/gcc-12.3.1_p20240523.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-	        MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20240530.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240530.ebuild
deleted file mode 100644
index 1f38c9fc478d..000000000000
--- a/sys-devel/gcc/gcc-12.3.1_p20240530.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-	        MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20240606.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240606.ebuild
deleted file mode 100644
index 1f38c9fc478d..000000000000
--- a/sys-devel/gcc/gcc-12.3.1_p20240606.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-	        MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240524.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240524.ebuild
deleted file mode 100644
index 7f5e607cfbc5..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240524.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="16"
-MUSL_VER="2"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240531.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240531.ebuild
deleted file mode 100644
index 7f5e607cfbc5..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240531.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="16"
-MUSL_VER="2"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240607.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240607.ebuild
deleted file mode 100644
index d0662c3779cf..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240607.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="17"
-MUSL_VER="2"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} == *.9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=1
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$((${MY_PV_2} - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild
deleted file mode 100644
index 05c6bd6ce397..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="14.1.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	# m68k doesnt build (ICE, bug 932733)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild
deleted file mode 100644
index 05c6bd6ce397..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="14.1.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	# m68k doesnt build (ICE, bug 932733)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240608.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240608.ebuild
deleted file mode 100644
index 7c2bc0dc66b4..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240608.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="2"
-MUSL_VER="1"
-MUSL_GCC_VER="14.1.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	# m68k doesnt build (ICE, bug 932733)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240519.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240519.ebuild
deleted file mode 100644
index 9a4195c2fdab..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240519.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=master
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240602.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240602.ebuild
deleted file mode 100644
index 9a4195c2fdab..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240602.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=master
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild
deleted file mode 100644
index 187ba0a09260..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="2"
-MUSL_VER="1"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=master
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# 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="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
-fi
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240526.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240616.ebuild
index 9a4195c2fdab..b2ef3b0ac50b 100644
--- a/sys-devel/gcc/gcc-15.0.0_pre20240526.ebuild
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240616.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="15.0.0"
-PATCH_VER="1"
-MUSL_VER="1"
+PATCH_VER="4"
+MUSL_VER="2"
 MUSL_GCC_VER="15.0.0"
 PYTHON_COMPAT=( python3_{10..12} )