gentoo auto-resync : 15:04:2024 - 12:04:02

9 files changed, 363 insertions, 0 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 55b0cff8e0cc..900970775b16 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 364bf0d97432..bb49108b9171 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -3,9 +3,11 @@ AUX autogen-5.18.16-configure-c99.patch 1380 BLAKE2B ec007ffc3052d156e2dfa671cec
 AUX autogen-5.18.16-guile-3.patch 1277 BLAKE2B 18aea6b2da8afc14c37ad6dc6b21eafcf76a93715c399a167237d653aa133879093c6b0c430f28941db8f2b5c5760b9c9586a19836e9692cd080afb9c4e0efac SHA512 a006bcd4dd496274894f7d57c8884171a370fb1fd59bf2e61478c5848b3f3a2dedcda2e01a3f70a4904036ee097d570491065d1f2bf18bcb2ce7525727e17689
 AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc90cc47412ca79fa58a29ecebd6ba1f201aafca7262c7eec30749e684148ae845fb1db1f8687b15b9a332e12462a12a0 SHA512 27489e5fd3a9df979a43c479d30e8566e863cd70d20ebf5788582aeaf8144912b7153f42f8df7156cd11b21ab849ff984f5042667500ee041af76de85a8eea3e
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
+AUX autogen-5.18.16-no-which.patch 418 BLAKE2B 395fb12e26d0bf5275e6f6f938a2cbd3c054a5377cd8cd7ce72c812f6feb5617d4106481d7b1b8085b88f0e3fb42bbdaa849364b3704a38d8718d380bd20344b SHA512 80a4a1b4a996ddc61b22e38ec371fe385a278199b8b191f5ee516efa093592c20782ccfe979d716d56583dd1eca287c9e4feecde844a9e7326f9e055e450887e
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
 EBUILD autogen-5.18.16-r3.ebuild 2190 BLAKE2B 5813fa357b407ac9fc1cf16449ce29dbe269d36cc1bcaba4801ebee1367a2abeebed783acc829b0e5882032756b4cb0c23020ef4aaada68c3cfc9aeb49bdc8a4 SHA512 6f942d7bf76ae12de62bbadaffa44787fa30eeb6d42764157d3064f78ee9d3941b60c252a87887c2a8fab44a1b7f834fa08975b7b15766c75cf3e928cdc11650
+EBUILD autogen-5.18.16-r4.ebuild 2184 BLAKE2B ce27d8813c98ce3212ac1c90282242f53e3b44af12accd16ec6b7e5c7ce1175dc7b0aa8c2b5f16fb6496f3c4c044efd8fd8363946664d5c26c2104bb0381f9e0 SHA512 d5efbb2bebdbe970a9b691d88bbb636fa8772b72864d7012f0e12b266e12a0457fd04167d1fc0efdd0c3a008549e913d4c3b93639f2612845a9ed8d530591447
 MISC metadata.xml 465 BLAKE2B d749ac3e74b39a006006e3f8d09ca2e8dd392f05385ffaf4d4d4cc95af4571c48e6ff6383e5f582ed6158d3536c9d9447c8f9587a8dc8ad9bce3ea3d5f8b2b5a SHA512 da4398891bf5ddd30545e5ca15b1591da5126d0ae22d00a5d5851864351c43465e6eac9010a9e35a029eb3009727fcd3264cb4fa87fd1f6545639f90b9cf2a47
diff --git a/sys-devel/autogen/autogen-5.18.16-r4.ebuild b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
new file mode 100644
index 000000000000..d767e53a32bf
--- /dev/null
+++ b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic autotools toolchain-funcs
+
+DESCRIPTION="Program and text file generation"
+HOMEPAGE="https://www.gnu.org/software/autogen/"
+SRC_URI="
+	mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
+	https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libopts static-libs"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0:=
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+# We don't pass the flag explicitly, bug #796776.
+# Let's fix it upstream after next autogen release if it happens.
+QA_CONFIGURE_OPTIONS+=" --enable-snprintfv-convenience"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
+	"${FILESDIR}"/${PN}-5.18.16-rpath.patch
+	"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
+	"${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
+	"${FILESDIR}"/${PN}-5.18.16-guile-3.patch
+	"${FILESDIR}"/${PN}-5.18.16-configure-c99.patch
+	"${FILESDIR}"/${PN}-5.18.16-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-5.18.16-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	# missing tarball file
+	cp "${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h autoopts/verify.h || die
+
+	# May be able to drop this on next release (>5.18.16)
+	eautoreconf
+}
+
+src_configure() {
+	# suppress possibly incorrect -R flag
+	export ag_cv_test_ldflags=
+
+	# autogen requires run-time sanity of regex and string functions.
+	# Use defaults of linux-glibc until we need somethig more advanced.
+	if tc-is-cross-compiler ; then
+		export ag_cv_run_strcspn=no
+		export libopts_cv_with_libregex=yes
+	fi
+
+	# bug 920174
+	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if ! use libopts ; then
+		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
+	fi
+}
diff --git a/sys-devel/autogen/files/autogen-5.18.16-no-which.patch b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
new file mode 100644
index 000000000000..c4b462cba420
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,9 +149,9 @@ GDnam=getdefs${ac_exeext}
+ CLnam=columns${ac_exeext}
+ if test "X$cross_compiling" = Xyes
+ then
+-  AGexe=`which ${AGnam}`
+-  GDexe=`which ${GDnam}`
+-  CLexe=`which ${CLnam}`
++  AGexe=`command -v ${AGnam}`
++  GDexe=`command -v ${GDnam}`
++  CLexe=`command -v ${CLnam}`
+ else
+   AGexe=${ag_top_builddir}/agen5/${AGnam}
+   GDexe=${ag_top_builddir}/getdefs/${GDnam}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index baa00742bab7..6a53567ca5b9 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -9,12 +9,14 @@ DIST gcc-11-20240111.tar.xz 76240620 BLAKE2B dcf3b2493ca6ba1a9cd0137186cfbf1b962
 DIST gcc-11-20240208.tar.xz 76276224 BLAKE2B efce83c3ea03093546b73d7731ac1051da7a2b0309612ce5b809ae2756bf7a949c94f951f6a77e789f7669051315e1a4e4c33f2b12a2ec1999ee9f1f39f6b13f SHA512 a0e2b4402ff187d0804e3bc2ed0a228cfce48476c1270d57798b060899f65c7e986945651d36c358f9df5eb4b36db13321e141895329b7382c130a0aca6a8962
 DIST gcc-11-20240328.tar.xz 76268060 BLAKE2B a3ffdd5a2376b1d3984ca39837932e1c6dc047ff6ae72eac0387cf27acdf8f1a1ff7e9584f631de348b6553e929892d8bc443ad6c40132a2636c39a8907c5eec SHA512 6372a99f2a1320c7df6e7984bb780395aaf8319624f311d955d5dbab2ac7bfb8de933c5b945bc3c4ea3b5d7404b8fc2d696825214b6563c1e032094a421b8bd2
 DIST gcc-11-20240404.tar.xz 76246936 BLAKE2B 09eed1bff289e960018b8c9c5d39e43ebcff78d344feba45d7889149e0de0d2727a54a0359471eab9a28cb38d5750b488c62cbffbf937ab7238eab51f3e7d0b7 SHA512 431f0b8d78f2b5e910ca8de8e8f64594f070639c17bc65a074650c217a5262cb9081db7e090bd3396e30ef50e92ed3ada0d163b4cabf04f2ae78fd02dba8c05a
+DIST gcc-11-20240411.tar.xz 76275268 BLAKE2B a24769b7f4b6d111b1fc46f9a99f9f731193a15b9a1a73fc224388721f0e3b6d02022eb0dc44a3d587522ad124bf63ce9ee50b9622ec91b55001c46fbc261776 SHA512 43fef6a426b4b8001c1d8707c34339203e66dcfa580cf289e20cd7abeaf0f8b57068ab1099099c4692a7acce1bc38bb978bcff6c309f30e3430457af5b7fb018
 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-20240112.tar.xz 79832228 BLAKE2B deec7123b8ffc42ddace51e1f3e8e08d5485f7000c0d4b7273b6311912ec0e7e2cb41124297af8c54456bb369a76fa2ef51aff552d8d680ec41dd2b144b08e55 SHA512 2c0a676ad35e6edee915c042a1751ac0263fae9b7af4d324deb49d6603dc73d3ec768832184879543e6ffb1595da5c56d9117288547adab7f243646dcbfc64ac
 DIST gcc-12-20240209.tar.xz 79824868 BLAKE2B 1ae5a646da470f06648c4766c77475ceb287c5f6647d5102f1aef6590f973233d5e7f83b5e0241488d49dba59dd605c211938379e68a393a2dccb3834103ae4b SHA512 9f9a04f4477f41bb2a5662aedef2af75b039de50c2dc99310e504e6080cb7aae06a1255337ea2e563975cb108ddc6766adbbaf4e3d5d5712801d7ba9a5209dbd
 DIST gcc-12-20240329.tar.xz 79862704 BLAKE2B 2ac09aeed2718acfcbb8d0d71e51f21cab9b186c73860cfabcf95a7ed4c37eb461fb26f86ee7319c614c21208c0fdf841b660d314eacd8314e8f323edd37f7cf SHA512 56d67cac2744c7fcb28eda9a29ba200d418a9e44fecc37b29747c2abac479e366b591ad6f7f92ce64b09dd3d0261af8ef28673beee1280618e043cf66f3b76ac
 DIST gcc-12-20240405.tar.xz 79849308 BLAKE2B d94046fead6cacd3e3b869f1db42843a2487d845ded332ad0fd55a7f290a4c3df72258dc1b74e4db3d7f7357e6b55444cde4b8863f2ce6f8691fd92bd49927fb SHA512 93ed2174ac3cdd8d5e885c6f4f546f9d0557e93bc9583a02d5d159c666fe6a82f30b6ed074f5f1e36f6f82855c41be527fb3d053498059ee4a6194575b00ed0d
+DIST gcc-12-20240412.tar.xz 79856320 BLAKE2B b83d64584a2c5bade96b7964349e4b760d5b40a4d10256799130d329f5748d2741a5122105f094f161f95eb8ade64109276aec723a518a42d695b41c8f08d61e SHA512 2a8a3ae4779f1cc897846b9d5e2eeb94ea8ece72d061c0f2436e854bb26eef33eb51c66bee6c0c363be04023e5c5ce3e3a88c9aaa7ae9faaa9322fd18dfbfae3
 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-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76 SHA512 aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb
@@ -22,6 +24,7 @@ DIST gcc-13-20240113.tar.xz 84356052 BLAKE2B 1fbfffc9f2afe443158e3f26182c8bdc3f3
 DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d SHA512 14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f
 DIST gcc-13-20240330.tar.xz 84407332 BLAKE2B 28b40915bf8e9ecf71b50d06fcdf69c01e87d3635f0c6b6159e003a0876453ada062cc538204604885e1350d226417fe9d7cbdb5e39146f9fde0d524ad34ff07 SHA512 4c4c4be522feb9ebe1bc868db59f0828de1154f80afad6c32bc2c7cf45df3797cb5e6dce2b35a297194ea87f81e34439f4d87bd88cabf0a29ce686e1b29e7a08
 DIST gcc-13-20240406.tar.xz 84392728 BLAKE2B 42a560b01677350c480bde2a7436a8be4d2259100dd6f2f9e7c5555adb3d13ee1f51bfae058ceb0cc2ca4d527b302b5250f26b3d6b26fa9c7a2f5715aa003a3f SHA512 e5ec524df7e9498a23ccfa42e28c5ce284fecdbb4771980328257d8251a11740c4cd3970d6bbe13052907b257d8e89b176d183c895168cf524dda12582d05d86
+DIST gcc-13-20240413.tar.xz 84405692 BLAKE2B 4df749357ed33afdb0255b4dc02ae568ce12e461c07a535f3736c2dcd9f779391846097aeb99ed70f5f45dbc029244a0c994b84f1de1086cce3da23bba719984 SHA512 934857721e1a92ea709e1ff6f64dbb8a47df4c614935ec298ded0a19bb92342e50bb8ab7eccd6e3ab46ca00e86ed34b499d4b06379a689bf48bf4201f3956006
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-12.tar.xz 47404 BLAKE2B ed018bcd7429d1c7aace746cbfc4e59dae409fc0a35231320c1b44c96fff0d912eba5c72109c2deb883f5368159df02148b2d4373396b34da882164c61fe4387 SHA512 b7872a03870bce7b633e4af4329b24fe8f3d50d6d9173f63549f606ce062787748af7f79e7ec4afeb768968d6e8462a849bd1b94316ea6bb284551f99e811617
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
@@ -30,6 +33,7 @@ DIST gcc-14-20240317.tar.xz 87764960 BLAKE2B 5cd957c3bf5e2fbb134b716a7ed14c0ace6
 DIST gcc-14-20240324.tar.xz 87808876 BLAKE2B 546b69f4562cfee6a3d5d8700e2a9bd0da001e3dde04825754ec5298144243ea4c975d0bf0366711fc9680f263732afb40c083fe9268f578b89e7d006b8d4955 SHA512 16b00690bf541784a109bc2382bbdf8ba6b72b416b130905d020182708ae687cbeca28197ab16539032ce9db3ad0e062e4231f9ef4c2d2452b14ed2b0ff3596e
 DIST gcc-14-20240331.tar.xz 87841560 BLAKE2B 7a3c0beb8234c38e4ad5d27369e848c178053a595bb6a4d2f5e2c848c5ddcd8a89b7674190d6964d5b3fd49709fb3f9be22e651a21543384f0210355bfca79fc SHA512 c7883d3ecb65e46783d8ce5efa87b53600aa84736a9af026b51ed5fdd827cae20729d4cb5cba70d3322ae7ca72c2d5a6944e5dee4174226bfc3c6398777d6377
 DIST gcc-14-20240407.tar.xz 87887372 BLAKE2B 76f9994af354fdd262420d80c6780dbf447a2ef64f09702523c31056d662227571d70cffab067ba82bcf4dee02a81a072382cb579a15af6f0b5edd4c1e51c1af SHA512 02d1ff0ee65ab7b0159d3d22a30ffd9055f3e7bf5f598663d5b711092dedd96bc67b511da37cbc785987d2f3460e2e38653c8fe6c7c3d34970fa1055db33cc0c
+DIST gcc-14-20240414.tar.xz 87980364 BLAKE2B 9b8d4ff7127d5f5cf805d6caa6956acaf24be3d628cbbd82d6bf926e40c8ed0088bf2bf386072ca3ea93ee4d945e4270c1977a5cf96ae4ff24ae32ce768fffa5 SHA512 552d0c49e3903cc42b46f44f1cedd5f1135997cebcd9e1d28c01474ef4365b1136cccb490923923c7633dfe94d744c8882fda1bb286a7dcb2cc26a90d4c3e99f
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-25.tar.xz 12352 BLAKE2B c006fa3c2454ef4db073f718d54cab33d2832d233199469b1755f23bb168fd725eaec7ad60fb89e4e9965ad2870c35a232edd07ea2a781ca1f0d67964ad4c2e6 SHA512 1ab587c2e9873dd93356dfff30f02916811392b4c878e16f5b2129f833a974f96245deb6db346dde01e07e4ab162bb83be7c5ba1e1edd32efc0404a422268c52
 DIST gcc-14.0.0-patches-26.tar.xz 12360 BLAKE2B a2fdd6ff1774bc94f96bc4f7da4092c373936c93e04b94e75701227ab55d530523fee6b561773d05080e51748cc7716868d8b108f51a06e37a2c26a1d7f39b33 SHA512 1275e6345417ee196e74c46845d05508c8662d71e2432fbfbf7f1eb9c220657b4ee8e3b0ca02b7b4c7e14df164f254380c65af91cadc3bda4cd7afbe6af5ea8b
@@ -43,21 +47,25 @@ EBUILD gcc-11.4.1_p20240111.ebuild 1652 BLAKE2B aa80934e333648b7bea20081f5b31280
 EBUILD gcc-11.4.1_p20240208.ebuild 1660 BLAKE2B 5105e3a80761d6edef1e8d98b766b7e761263dcdf350615013f6dff0be6e6fb6b4ecfda8daa132e21ea41728879aeb24174569dac6d88582127d607fc60bda14 SHA512 3698656b0410504fa2e576a3906c6a165c682a60d43ffb32249600ff98c4cfd1b43600eed2bde3c6498c89f54e15b173b15524018661c820281debbd9cd237df
 EBUILD gcc-11.4.1_p20240328.ebuild 1661 BLAKE2B 4cd69e98f6a2fffc176dcd4f4638fcf37b23b650d63dbc2676babe652c6f5b0131c7f0f3cd1e25a29b10a44755647f690cb4f0a34a993890b447e11eda083546 SHA512 b9dd8fedcfdcdfb9e5b5adf3ef99f7f3b0646c43fe399238a04ed4aa6746de0adc699fb6d11fe0bde3976e5d67b8dd33bba072e727bdbc808eba66d28e7113e2
 EBUILD gcc-11.4.1_p20240404.ebuild 1660 BLAKE2B 5105e3a80761d6edef1e8d98b766b7e761263dcdf350615013f6dff0be6e6fb6b4ecfda8daa132e21ea41728879aeb24174569dac6d88582127d607fc60bda14 SHA512 3698656b0410504fa2e576a3906c6a165c682a60d43ffb32249600ff98c4cfd1b43600eed2bde3c6498c89f54e15b173b15524018661c820281debbd9cd237df
+EBUILD gcc-11.4.1_p20240411.ebuild 1661 BLAKE2B 4cd69e98f6a2fffc176dcd4f4638fcf37b23b650d63dbc2676babe652c6f5b0131c7f0f3cd1e25a29b10a44755647f690cb4f0a34a993890b447e11eda083546 SHA512 b9dd8fedcfdcdfb9e5b5adf3ef99f7f3b0646c43fe399238a04ed4aa6746de0adc699fb6d11fe0bde3976e5d67b8dd33bba072e727bdbc808eba66d28e7113e2
 EBUILD gcc-11.5.9999.ebuild 1628 BLAKE2B ef06d478aa03374908e4de6c2f72f09e542adce7c65f35ccd67cd064516c79c31c269f2032131587eb87ab17cd1e3f50bb0fa2d2481034556776aadfcfe1f923 SHA512 a73fc1b465111928150e137ffbfa68b94beb500d35051a7c6792a96100eb77cfd878d2d29a5d0ea11b1128a0ecd7db773c934941d74a033270b67ccbf3704df3
 EBUILD gcc-12.3.1_p20240112.ebuild 1659 BLAKE2B e7173a878d8142dd0ee6894834f2d22df58833bd28e1cd8f694f739c0c5ceda1023a341962948393dc429b457df99f48c7745925dba0bceb834069944db0bbe6 SHA512 269e89b36175df1d213b206be1c634a3a9d0bad2ec631f0efe34616f263796f2b347ded794ccc78b0e4b2cc9864612ec9f7b28fecd24d198cc187cec4779c0aa
 EBUILD gcc-12.3.1_p20240209.ebuild 1659 BLAKE2B 17b2b2cac581d805ff5599a5e66805207721bcdb43eab0533ace70831a4fea200c2c83b50f9da88ccbb1db9aad309af240ff799980d47e09258e667c3b20f076 SHA512 b05747108fbbb4eca4e7db03b3975481e473cc07f77b30c51588ed1096fec1ea4c89d73cb11cc3316d8bafe86f867c666bbbf0c6f893763bcf0f3a04045c5e42
 EBUILD gcc-12.3.1_p20240329.ebuild 1667 BLAKE2B dc93952f0c0a2bfd5dcf107d5fabda72c337e9bff179534967bde9e4b7c26151ae2fe93e6d05ac2e2b8ed965914e1c2b7e34ab947def1e01fa6748cc01e070a5 SHA512 ec9068c3af29d60ff4b397cbaa16604f33d45f0ac0a57742b1d6b13d2273785f12b3950e097f93d1e527e7ed5fdc844e6421b21360316a8a9da52e6144d4ae17
 EBUILD gcc-12.3.1_p20240405.ebuild 1667 BLAKE2B dc93952f0c0a2bfd5dcf107d5fabda72c337e9bff179534967bde9e4b7c26151ae2fe93e6d05ac2e2b8ed965914e1c2b7e34ab947def1e01fa6748cc01e070a5 SHA512 ec9068c3af29d60ff4b397cbaa16604f33d45f0ac0a57742b1d6b13d2273785f12b3950e097f93d1e527e7ed5fdc844e6421b21360316a8a9da52e6144d4ae17
+EBUILD gcc-12.3.1_p20240412.ebuild 1667 BLAKE2B dc93952f0c0a2bfd5dcf107d5fabda72c337e9bff179534967bde9e4b7c26151ae2fe93e6d05ac2e2b8ed965914e1c2b7e34ab947def1e01fa6748cc01e070a5 SHA512 ec9068c3af29d60ff4b397cbaa16604f33d45f0ac0a57742b1d6b13d2273785f12b3950e097f93d1e527e7ed5fdc844e6421b21360316a8a9da52e6144d4ae17
 EBUILD gcc-12.4.9999.ebuild 1635 BLAKE2B 0d06fd80b8a92a3fef8ca50261424d7a88a9c32ac1eb7944adc0f30dd157338ff252a92ef149819b0ad95b26860b8cb6daffc2e27fa5b864d0ce60a5f12d4585 SHA512 349ca2be138722efd8460a9ba825b1f2f054828b39e06beb8f18c2464c820aad10d6442660fccb1bcf862116a6ed5c819ec82b09ff96ac260075901ff189c22e
 EBUILD gcc-13.2.1_p20240113-r1.ebuild 1719 BLAKE2B 60e1566a6db15aef3078ac0bd2dfac63b4424bbcbf6714cc73c0da83570352bd6af334ec067b403324cfdbbcbedbd869224af626a551c1afd5c4a27e77b1e46e SHA512 2bab4ba67ecea1bdb0c4622d98538efb99f52e0579b34a952949dfed2752c3a767e805a195e1206aeea5e61f40ec64fd34eec9e80db580aa3ad52159dceb2a68
 EBUILD gcc-13.2.1_p20240210.ebuild 1719 BLAKE2B d9bb1a8b735e2c5fa305aa1f5e4ce4587a856b340c014487207af8ad86802d64899a456db80b70f2e35bad69c786025e6af9ece297e8e8b1f6446b1253cb8c62 SHA512 5aa59cd0299ad724e19044ef0393fe1b9e5ba885bad2d9ef9dad7bee5c54ab9bbb44fb54790a42f03b41d9d21446afa52388eb54d6aed385922490fba1f5a683
 EBUILD gcc-13.2.1_p20240330.ebuild 1727 BLAKE2B 3450595bbfe36e9c1911ed35d5956035692328e801ec7ae86fadfcd61fa55a07e89685d8d65738d62e80ea0bba09ca4a034801af7abe34ae983ed4b963f3f295 SHA512 4497f79d76027fa8110af1ed7fd4f59e00e673416f86a7db5657287a8d1b7cf21df071c690d1fb03756e79f0219e55c3fd5eed6806aca5aec2f204ad20ec0125
 EBUILD gcc-13.2.1_p20240406.ebuild 1727 BLAKE2B 1c5dbab007729b544a2f8daec33cb6f6912f2c0a49d43ffdf15dec9a3cfbd12e46a4ce0b6f5a193f4c47a21cb7d4ecc1a5bee1b4a00c91776786d99acdbd7a02 SHA512 edf0e5d3fea819fd4ffeaa5264acc3bcbf39f10d23d1c8c4b6af1189de7b0e724b874a7579517cb421345825ad01d2f4990c671380d8d4cca4e71611f788ec58
+EBUILD gcc-13.2.1_p20240413.ebuild 1727 BLAKE2B 1c5dbab007729b544a2f8daec33cb6f6912f2c0a49d43ffdf15dec9a3cfbd12e46a4ce0b6f5a193f4c47a21cb7d4ecc1a5bee1b4a00c91776786d99acdbd7a02 SHA512 edf0e5d3fea819fd4ffeaa5264acc3bcbf39f10d23d1c8c4b6af1189de7b0e724b874a7579517cb421345825ad01d2f4990c671380d8d4cca4e71611f788ec58
 EBUILD gcc-13.3.9999.ebuild 1635 BLAKE2B dd8eb497c0352febec3886808c4837e880b858ea20e68135ea72432919a9a7ff4a7e130912c06aad1e6db31f30db3e697f7978df1644f181d824be0ddbfe096c SHA512 211e181b1c449adefeedd28f6e304eac634797e897c39418da28d0ab20f5f33cfae7c10710f007fa0690cd049abd6e4a5adbd5dd02aaa6f532cbb2a593692fc0
 EBUILD gcc-14.0.1_pre20240317.ebuild 1701 BLAKE2B b3884316f5d5dfb8f5aeec04952f12b930e69c34acc98a758304ae3d8b10a2cf033dd92fd1ff71924d90095bdaca76b3f076af24d751344da73296d78e6fb2c3 SHA512 f822283f4299c844fbb4ea4e3cbb631562435b4ce37f41a5700a0477970cda8bb4c399a0adcd8fc2b2dd58b82f442b1f86727061849ed57d2debbda1c60e3b76
 EBUILD gcc-14.0.1_pre20240324-r1.ebuild 1743 BLAKE2B 2f95379995ab1f1d5984797ac29964b31d4c7c38b4c37f682eab29019df08092ab4ae272f939ad58c4e04e2d272c5206ca4270549c75dd5899d739c064bf9e81 SHA512 fec375ced34cf10dac1e244c117000ba89e81eddce2d7fc1805f8c9626d8e4e67c3d589f77fbaa335fa77f7d2ead6b7bba110378d7a883588842442315d1b410
 EBUILD gcc-14.0.1_pre20240331.ebuild 1701 BLAKE2B b3884316f5d5dfb8f5aeec04952f12b930e69c34acc98a758304ae3d8b10a2cf033dd92fd1ff71924d90095bdaca76b3f076af24d751344da73296d78e6fb2c3 SHA512 f822283f4299c844fbb4ea4e3cbb631562435b4ce37f41a5700a0477970cda8bb4c399a0adcd8fc2b2dd58b82f442b1f86727061849ed57d2debbda1c60e3b76
 EBUILD gcc-14.0.1_pre20240407.ebuild 1701 BLAKE2B 2d766ac2a880ac88b323e78b7c15d1758509b2180908742742913a26d583b110204193188f23eee483d5ccba736e4ad26c51f668366df3678a92a887bd37d82c SHA512 836d8a4658144abc598d65271e97b38f94a9a8882f39e3400a319c66b1e82c07bf1171a52bd9f8c2869f80b4327976e00f35354e5387518bda419023c4d2ca21
+EBUILD gcc-14.0.1_pre20240414.ebuild 1701 BLAKE2B 2d766ac2a880ac88b323e78b7c15d1758509b2180908742742913a26d583b110204193188f23eee483d5ccba736e4ad26c51f668366df3678a92a887bd37d82c SHA512 836d8a4658144abc598d65271e97b38f94a9a8882f39e3400a319c66b1e82c07bf1171a52bd9f8c2869f80b4327976e00f35354e5387518bda419023c4d2ca21
 EBUILD gcc-14.0.9999.ebuild 1368 BLAKE2B 69defab2f5b5ed8bc89f6ba33f8ac053784a9c8210a0f373112ded22c094781a745c7accceb9f79f66887be901c068c1fbc9e2341b46221fd0419c5a72c57cc9 SHA512 2a62edb513ea86e9ddf25f47b7682ae29932e997240bcd0ac5027ab84ad07d11088da84745f3e8bab73fd831d5bf2320dd9657cba8f6ff8f7bce115da90d0492
 EBUILD gcc-8.5.0-r1.ebuild 533 BLAKE2B 70a6e6b0b3069eef47e44de127b26b140abfb3a7aab57db3c27c9b30743be20962eeab91654259824c9a3808e30c6dbb48bac4ac3ae18525ce9c4b71eecb03be SHA512 8853dafa3f3e1e5371edddd277f1b2c9f47824fc1fee6a4836ffc8ff9f8bc3dbd126747d62017eef171232db190816b4a8b796d517d3f5ec8bc718f680c7d0ca
 EBUILD gcc-9.5.0.ebuild 1241 BLAKE2B 856375d942a3e927e1449c2b1d0abcbea0a0a5ef5aca203d914747b0bf1fa54de965e219d8722b635bf844cfbdbc8edd2c0f6ab6bcefceb473a4f629420f476a SHA512 d9d6ab8119dd21a43e98481882f7dd4a58f250ab9296b6d592bae86c825a253b7047ce4b067a53de8ed81254be8e2352fabb167eab656b51bba8f666e247f0f1
diff --git a/sys-devel/gcc/gcc-11.4.1_p20240411.ebuild b/sys-devel/gcc/gcc-11.4.1_p20240411.ebuild
new file mode 100644
index 000000000000..5ab7ed2dbcfa
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20240411.ebuild
@@ -0,0 +1,65 @@
+# 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..11} )
+
+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_p20240412.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240412.ebuild
new file mode 100644
index 000000000000..2c4b89e72445
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.3.1_p20240412.ebuild
@@ -0,0 +1,65 @@
+# 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..11} )
+
+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.2.1_p20240413.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240413.ebuild
new file mode 100644
index 000000000000..2a22fc220b4c
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20240413.ebuild
@@ -0,0 +1,66 @@
+# 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"
+PATCH_VER="15"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+PYTHON_COMPAT=( python3_{10..11} )
+
+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.0.1_pre20240414.ebuild b/sys-devel/gcc/gcc-14.0.1_pre20240414.ebuild
new file mode 100644
index 000000000000..00b7365febb9
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.1_pre20240414.ebuild
@@ -0,0 +1,66 @@
+# 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.0.0"
+PATCH_VER="26"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+PYTHON_COMPAT=( python3_{10..11} )
+
+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=master
+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 "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}