sys-devel/gcc: Sync with Gentoo

It's from Gentoo commit 88b98060a1b9033d899b31ef8e2a19224daa040d.

sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest

@@ -1,32 +1,27 @@
 DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
-DIST gcc-10-20230503.tar.xz 72130916 BLAKE2B f0dd2c3afd7c59061672f2d0a6291a8c4ba97060199e3a590a2077af69daf269610008e3ce85a00231a8392fd8f53b4c75ec4ec0e0feb360600705b8e88e41fc SHA512 ed3dbadc6445b5db699309a9f5bd047454d863135a1a3c2e379a7f51bfbf0f49dd176239ccb312e9dd0f7e93be35862867b85d761db2ca6943ae08cd2b0503ed
-DIST gcc-10-20230510.tar.xz 72137544 BLAKE2B 8f0c4cf89e03e7c7589ae67875c35933837f71da5526b2f38c71d557dbb113849d3e66e8f6d03cfc51ab0d047b4e7cf066301ad8805a8c0797a379feefc4f6dd SHA512 b83cc9a8939a5d4d5cf44ff49d082bd66d8f0e4059a25279fa9fe8e458d0c8fc17a9718188821d64e7afcc47000310f8578e00f18d86079abd6b551a8b75fe42
 DIST gcc-10-20230517.tar.xz 72135000 BLAKE2B 8ec87088ace2bf7cc355357b8c9b12e61646366ee1204a360f3be0dcc8b7d426ba5fbb7eb46b4da4c937f5b63d2181a3935f2894f40556f1472dd2a91197b38e SHA512 ae685e1e3fc3460ea49bd86b2b583ef97c71ed279cce6f06b293bd9c7f7ac5ae477b2f2057c4ed927114249e41f6f7978f13db678cd92935dc1250bdd11c94c5
+DIST gcc-10-20230531.tar.xz 72141512 BLAKE2B 266073f3d5baa50aad8dc9dacb859a355ddcbe0295e0fd1f99d7ae3847b495bb96e5eb06b5dac9d4ba1a16325fc90724720992d7f5e90e4081fff754a3f8219e SHA512 19d81824624da4555e567ab8f5a1f1a3f9eac0a8360d27a402b45554cd9b1a644f37e0354df8ba4f8dcc2ac493e149f0fda3de4249457158db267afcfc81a87c
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d
-DIST gcc-11-20230504.tar.xz 76185732 BLAKE2B d8bc17e7a38078e2ffe918ba70ba7ec53aada1c604b6cefc54c577f965d46634de1a94b985cb3fd8417f12217b29a67e1ff2c10c342eca85a3185ad2a4e0373c SHA512 e5c423a6049b11b8f1de776b861bd2eb86d1ce939a14c7bbe6244ee74ace2b3cf079135a846f71706f5996172d0e1e0695420938e18d990140d19bcc28dd10b5
+DIST gcc-11-20230601.tar.xz 76183336 BLAKE2B 90fc8d803463a3c34a27aaa05c6ab28ce2478d8e10929b61a18e3055778d65f22ac8a53f8d6c5632ef6aabaabec9aefb95a10157f51f85b3afd6f401bbad4edc SHA512 715f226178182c9c28703b26378784dd38f7a90aee74d0b01fcc24d867a39e36765178a7c08d6ffa4ff8fa45952092002441ddd7426bbdd306b4af11cf25e3e7
-DIST gcc-11-20230511.tar.xz 76188960 BLAKE2B 9241ea149cfd7ebabed4e255fd60924a4759c2e4c13edf2e84e7f2c129af6740eb9a22a353e14a05c4302b3e75df2a165a6ec23adc40247aa47f483173d36e64 SHA512 c265ad11858138c63eb7379abd625b126b6d21fe69c64429b4401dbc8ed625a5e5ba0ecf96da36b497121e0d613b11abee0a97b90a8a56bf240bf142f749852e
-DIST gcc-11-20230518.tar.xz 76192980 BLAKE2B 8397a32e6f5800b3ed7be3d7f4afd03511ecd39e93b210a73d59a9a6bf9a7daf8e20524842a661597727df16548fba1a650884d7a4518d647387cd48825116de SHA512 5259726703a8769e0a170dffdb84ce605ac43289b13a9b2cbb95fa19a9abc37859176e5184ca8958e209991ebe4eb9e3ce2fe22f66c7cec1d434a630a68d50c3
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
+DIST gcc-11.4.0.tar.xz 79837032 BLAKE2B 6e3b095a5837d4b5512719f848f4b9c4b4a6d7dc40ba96b269023ea5ea84f632c42a13855c030e255f3265445a45e6d2648dfe0e2cc0ea47da87c4660b052e24 SHA512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14
 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758
-DIST gcc-12-20230512.tar.xz 79749352 BLAKE2B a2dd7c780d2adf1915cb01f6835d6f95242376d9d7c14ec0fea8e905858f0ce20b90dd3f47fef983b9d1a6f519f0c3d4cfa41d887f477454378a12407e9aaeb8 SHA512 3bf04b2489b0b0d062f8e8e66c31622fe7aa6ef6c9ba7d51f387eae714a813a089594cebdb046fa04e53da24a9788879711eedb054c3a37721035386b94ff0f0
+DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d
-DIST gcc-12-20230519.tar.xz 79757700 BLAKE2B 81c18adedc9f0eae729a72814a47ae496c9ae78f13e9cf2f442b3ea09c577e84e3261a6004d1634125bbc77c39298328a0879eea1dab26966b85f9f10887f114 SHA512 cd24ad69a6c47a95384d8fd4fcb7e895f8fb4d8e0c4b74d1300943fa8198624e3c40b0bd7702cb78f40849a09b5069e50e36bc191bd206b36c956ca25126ee02
+DIST gcc-12-20230602.tar.xz 79776104 BLAKE2B dfb484937f71c9b10e6674968db67f131c8009b04f5bdce215776d061989924fca2bebd8193a507a714fa204aac7b02f111ee303446bb8fd08f06c8226d206df SHA512 b7fa625657c911f56a617aeccdb161b319b3d515704d16795fd577c9fe1e9b915039fe542681be9b733d21908cd57553317a0d6ecdbdf42964191b3ce11286c2
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-12.3.0.tar.xz 85491976 BLAKE2B a239749089e284887435b9fabc360a36764be1095f4c78eeac6f056f91dd23c49dab2ebec5da32a81bcc08fe8277dd3c714ad114ad725d24317faac03354d595 SHA512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204
-DIST gcc-13-20230506.tar.xz 83939392 BLAKE2B 439a139f6ef4b4c3afb5d3e4db69f2a4aa24a410c7b9c6689e58b2eec6383388ebbbd8a6f7be1d5cba2aac770ec7758a8b4b6bae80c63475a3b72372d1bef283 SHA512 5255500c92a72fe066b110efb20c73da217ddaf38d726b1a8f051dd27b6a613f3b4379762cdf4310823113e9bc75a31d6d72c060b20216a2a6bcd34800a2e1e1
-DIST gcc-13-20230513.tar.xz 83957000 BLAKE2B c1d17c383b5735744952ef61fa34f0129b304cae78dbeb0e780a81ec4dbfbbc438f8546770da973155ec5f9250d36be587a8491c88d4424b1123f47ba24d52eb SHA512 a82e38d273a668e4a8ad33282cb74661d125babcc6165eb0ada5da471154b2ed2894bf1fa462f0345f9d817e733b155c09a971885f3b7c04398ebcdd3b5551f5
 DIST gcc-13-20230520.tar.xz 83959400 BLAKE2B 7be5d333a2447923c547ed76bab86fb9a1206dde1ffeb8be0a2cb95f8e99910aa40479f221374aaf5bdea5dd7514b3d69347512d9cebb91dd23f585541efa43a SHA512 d6c8626822855f71cc58b6b36ebb38092aaf12fa9aa40b8d70fb3edc9f4c614fbf47626ea5cc1ec631bc47b5d64911bfdb7cfc6924f27a54016b1f8c9c7588d7
-DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33
+DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82 SHA512 87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152
+DIST gcc-13-20230603.tar.xz 83954444 BLAKE2B 4be067c2159ae2a8ef3d699acab981cb911668bb0af84693b0226f58688146b0f93324296c584c6dca6df839ba344cff927cc82d20fce8c6b2282b256d745141 SHA512 ca1b41df7bf18c65189116099afcb43f65e13b17e57bf52049e739af223d51c3b825e2f80e239a3ddceec07693c991a85ec58ab6855255802d8bd413ff4324cf
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
-DIST gcc-13.2.0-patches-1.tar.xz 15792 BLAKE2B 2ffa9ac013c0f9a91eb93e87e3bc6c378d02cca32ad3f8a84d1249e257eb02b206ec10fa425738a4bae2ffb7db8506afcee2a8dd855357e4b48636608aa24e50 SHA512 917ea178f3696724f9ec08aebb6976f03c5edf8ee21bb4bad7e2d820507452f6dace6e847c4f342a52870642550f34da0346ee635a60ba0c1bff667e0e31d195
+DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
-DIST gcc-13.2.0-patches-2.tar.xz 12392 BLAKE2B 40ca4c230166e39d237e4b939669e51b991f58d0e1787c43f2bf468447de478604d28b6e9b20f5991bd01b9efad4860b30567c8df5d823cf6fc47678f9e6b672 SHA512 d00f559b2d6ad98f97a9328d2ce1593553fff727033690dfc13f520775e977b674fe14cc1ec7ab52b246e091a055812eaf4f93306145a4d2ad87a55707a3717b
+DIST gcc-14-20230529.tar.xz 84197648 BLAKE2B 1b8b812866294bafd7bf53c823b3d55288d5a30c54e921495d19286b9d04a1bf7c5228b052941200ecc61a516355d977229fc9e60cfe4353154811c1261054ab SHA512 bba930dc4b6b6a45bb5f33e4b46dc16d1d581b266078c5492833e2b4e64a93d2d19389a436c64dc2159240b07134f4f7242bef3cf35f303d34e10bf493fe70ba
-DIST gcc-14-20230507.tar.xz 84069364 BLAKE2B 579df5cf4b0d16aa29248259e235dd7c05454c8c5b999928cbf200d52997e0615391e06308e9e0a72f7a1f1903cb86305137eceb97cd8ddd0cf40b4a21a05a86 SHA512 1598b9565bc9554e91d5be2b58d8c0861b72e97b79aa952c084ae4731c0cd1ca37d107a70b6a26235bf59322c1f4de435389906b4fe6f29b6e65e1b566aff5ea
+DIST gcc-14-20230604.tar.xz 84243704 BLAKE2B 72be938f47fb4e2a4e9553f0a5190caaaccafedae6054634d1bfeb14a39e809d678578358d5a0b7c024b9b07b564eb4139fc0bcf1740d87e4954250c97cd3959 SHA512 75a48f751bff9a74a7eca85070423d69e9ddcc23306e7fa107c0b90fb86e720c952422ff48ac81dfa66df5a08f428b8087c6e20c58cc04d24d3300f1dcd9a140
-DIST gcc-14-20230514.tar.xz 84081088 BLAKE2B e385298bac832374a4773bb4a30fa42f66262378417ce3850c62d69300c76e7a9feae8fb51285edabd9ffed423ac4b688c52bc18d76aa700f255e951ca60f237 SHA512 839a7fbe1210f54b0bcb26e10f9ac26d262924f8d19eef62e33a8bc066c00a549a0b49cff088f5e23656c66f26a28c0721e376cfdd97a54f6a9b2ba3680f5e01
-DIST gcc-14-20230521.tar.xz 84139108 BLAKE2B 5db3844cfa92f2462871581e8d33b3f70d94fa9ddf203055e83c03fdeb60145dcedd1e8d6d2040bc56cdf6213b530a835da3c7b0766fbd538d2f690f5a74ff70 SHA512 8cc629c3f847c34ed35ca84d020a3d7a98ca5e29d15a3073cbfe303ec6c47ef938581283826773fa41268fda77fe723ce1669c4e31e5b2b0f5569d5782c0ebb2
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-1.tar.xz 11612 BLAKE2B a3b0f3952cf7a6fb095817f4727ccb5cff24607a5c2bb67d280da4651177132ddcf398243998271c509ccaf3445d4843ff691a12d5c394dad8d9c70fc4a8120d SHA512 66701c2e4fd1a031ffcb353a3a9cd1fe25d3d62167065523097e41a3e48adf4218ecf08e382e3ea22014c561ba3a15681650c5538cda91d38c69cbbf04503a74
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6

sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-12.3-ccache-ICE.patch

@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/906310
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109850
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109241
-
-https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=396a4e76afec30d2461638f569cae18955eb4ad2
-
-From 396a4e76afec30d2461638f569cae18955eb4ad2 Mon Sep 17 00:00:00 2001
-From: Jason Merrill <jason@redhat.com>
-Date: Wed, 22 Mar 2023 16:11:47 -0400
-Subject: [PATCH] c++: local class in nested generic lambda [PR109241]
-
-In this testcase, the tree walk to look for bare parameter packs was
-confused by finding a type with no TREE_BINFO.  But it should be fine that
-it's unset; we already checked for unexpanded packs at parse time.
-
-I also tried doing the partial instantiation of the local class, which is
-probably the long-term direction we want to go, but for stage 4 let's go
-with this safer change.
-
-	PR c++/109241
-
-gcc/cp/ChangeLog:
-
-	* pt.cc (find_parameter_packs_r): Handle null TREE_BINFO.
-
-gcc/testsuite/ChangeLog:
-
-	* g++.dg/cpp1y/lambda-generic-local-class2.C: New test.
---- a/gcc/cp/pt.cc
-+++ b/gcc/cp/pt.cc
-@@ -4106,10 +4106,14 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
-     case TAG_DEFN:
-       t = TREE_TYPE (t);
-       if (CLASS_TYPE_P (t))
--	/* Local class, need to look through the whole definition.  */
--	for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t)))
--	  cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r,
--			ppd, ppd->visited);
-+	{
-+	  /* Local class, need to look through the whole definition.
-+	     TYPE_BINFO might be unset for a partial instantiation.  */
-+	  if (TYPE_BINFO (t))
-+	    for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t)))
-+	      cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r,
-+			    ppd, ppd->visited);
-+	}
-       else
- 	/* Enum, look at the values.  */
- 	for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l))
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C
-@@ -0,0 +1,13 @@
-+// PR c++/109241
-+// { dg-do compile { target c++14 } }
-+// { dg-options "" } no pedantic
-+
-+void g() {
-+  [](auto) {
-+    [](auto) {
-+      ({
-+        struct A {};
-+      });
-+    };
-+  }(1);
-+}
--- 
-2.31.1

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230510.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="6"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild

@@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 #fi
 
 RDEPEND=""

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.5.9999.ebuild

@@ -1,31 +1,40 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="10.5.0"
 MUSL_GCC_VER="10.5.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+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=$(($(ver_cut 2) - 1))
+		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}.$(($(ver_cut 3) - 9998))
+	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
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
-# Don't keyword live ebuilds
+if tc_is_live ; then
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; 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
 

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230511.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="10"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	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=">=${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
-}

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.9999.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	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=">=${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
-}

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.5.9999.ebuild

@@ -4,19 +4,17 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
+PATCH_GCC_VER="11.4.0"
-PATCH_GCC_VER="14.0.0"
+MUSL_GCC_VER="11.4.0"
-MUSL_VER="1"
-MUSL_GCC_VER="14.0.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
+	MY_PV_3=1
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
 		MY_PV_3=0
 	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
+		MY_PV_2=$((${MY_PV_2} - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
@@ -32,13 +30,13 @@ fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-#EGIT_BRANCH=master
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#if ! tc_is_live && [[ -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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	# Technically only if USE=hardened *too* right now, but no point in complicating it further.

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512-r1.ebuild

@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="12.3.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	# Sometimes the RCs are e.g. 12.3 and not 12.3.0...
-	#MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 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
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	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=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-12.3-ccache-ICE.patch
-	eapply_user
-}

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.9999.ebuild

@@ -7,33 +7,35 @@ TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="12.3.0"
 MUSL_GCC_VER="12.3.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+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=$(($(ver_cut 2) - 1))
+	        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}.$(($(ver_cut 3) - 9998))
+	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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
 	TOOLCHAIN_SET_S=no
 	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-if ! tc_is_live && [[ -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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.0-r1.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="13.2.0"
-MUSL_VER="2"
-MUSL_GCC_VER="13.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-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
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	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=">=${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
-}

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
+PATCH_VER="3"
 PATCH_GCC_VER="13.2.0"
 MUSL_VER="2"
 MUSL_GCC_VER="13.2.0"

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
+PATCH_VER="3"
 PATCH_GCC_VER="13.2.0"
 MUSL_VER="2"
 MUSL_GCC_VER="13.2.0"

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
+PATCH_VER="3"
 PATCH_GCC_VER="13.2.0"
 MUSL_VER="2"
 MUSL_GCC_VER="13.2.0"

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.9999.ebuild

@@ -7,33 +7,35 @@ TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="13.2.0"
 MUSL_GCC_VER="13.2.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+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=$(($(ver_cut 2) - 1))
+		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}.$(($(ver_cut 3) - 9998))
+	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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
 	TOOLCHAIN_SET_S=no
 	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-if ! tc_is_live && [[ -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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild

@@ -7,14 +7,14 @@ TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="14.0.0"
 MUSL_GCC_VER="14.0.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
+	MY_PV_3=1
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
 		MY_PV_3=0
 	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
+		MY_PV_2=$((${MY_PV_2} - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
@@ -30,12 +30,13 @@ fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-EGIT_BRANCH=master
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=master
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-if ! tc_is_live && [[ -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"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
 fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild

@@ -9,14 +9,14 @@ PATCH_GCC_VER="14.0.0"
 MUSL_VER="1"
 MUSL_GCC_VER="14.0.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
+	MY_PV_3=1
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
 		MY_PV_3=0
 	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
+		MY_PV_2=$((${MY_PV_2} - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
@@ -32,13 +32,14 @@ fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-#EGIT_BRANCH=master
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=master
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#if ! tc_is_live && [[ -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"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+	:;
+fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	# Technically only if USE=hardened *too* right now, but no point in complicating it further.

sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230604.ebuild

@@ -9,14 +9,14 @@ PATCH_GCC_VER="14.0.0"
 MUSL_VER="1"
 MUSL_GCC_VER="14.0.0"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
+	MY_PV_3=1
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
 		MY_PV_3=0
 	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
+		MY_PV_2=$((${MY_PV_2} - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
@@ -32,13 +32,14 @@ fi
 
 inherit toolchain
 
-# Needs to be after inherit (for now?), bug #830908
+if tc_is_live ; then
-#EGIT_BRANCH=master
+	# Needs to be after inherit (for now?), bug #830908
-
+	EGIT_BRANCH=master
-# Don't keyword live ebuilds
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#if ! tc_is_live && [[ -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"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+	:;
+fi
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	# Technically only if USE=hardened *too* right now, but no point in complicating it further.