gentoo auto-resync : 21:09:2024 - 12:11:53

6 files changed, 137 insertions, 2 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index dc3a464f1d33..bbfef8fb1287 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 1412327dec37..c33a1ebe021a 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,6 @@
 DIST binutils-config-5.5.2.tar.xz 7548 BLAKE2B a4fe6f2039c4963ba09fb63b52bf3707b91eed36b514132c0c23da2474b9af6d2fd5b8eaef2dd8f44827f5d38095c936685765d3c4cc7404d06c4ac069cf1102 SHA512 c53118c1ce4b87c0446b1b9993fadabe2bd7447dafc9a2bf795a5e3b802348b4fa8aede06284a0c86f80f23b221b037a0404d5424f2f5aa796e8a3ea6945328c
 DIST binutils-config-5.5.tar.xz 7344 BLAKE2B decef43013ca2f7c6d36c12d08d55f499d866b6b1b55ed58f8b2df3761077b5e2c4d09d1f2c40762d42c2d3b9827575833a502b79180ef13b845f1a39a5f2feb SHA512 6f6e21799b47e38cd61621e4ec018dc0db4811f363c0817025c3e3be651d3790b30a0cab233f35fe40b1d57c88daa246037f24a7488187f4e47cca589d87d45b
-EBUILD binutils-config-5.5.2.ebuild 1058 BLAKE2B 36534dacbd9fd33c7f4b44baee3ffc2be5f6ad43d8a0bfaff8041f583cd1a8037cd9a091c2654570787873c1726831923d08823d948dbc4a1a3f53d39faaad1f SHA512 c843945f948e6b476ead300960e4591b3a69e5ac65f1fd4a80a4745a27ca676a154e1636e693526c92570e0aab29e3aaada6363354ad9edc25285c8dc35ca377
+EBUILD binutils-config-5.5.2.ebuild 1054 BLAKE2B 6e98183c16cdd534dbd5365b7a096c138791d03d04f16dcd498acc3bce100ead44d0ea72e6e7450f24c0683b69a03daaa2595b5e066ee7cd1487bae6f97a8d26 SHA512 22621594c3536264515bafa31a4d1442343148cf7344b1cce55001e194c0f90e747b4a4e0803609ef1ae244188cc7835fd46cadb64c1839c93d24d57d8f24d8a
 EBUILD binutils-config-5.5.ebuild 1062 BLAKE2B 1368b98e1c73ed49464a550c52acfb83103e1fc38e304efccabcc28e2d7c6ee169ab01b808a8cff0cc1604eb5de33f50c89fa2ad8ea0e9af0c31591c18ab902d SHA512 a577f12298282574082d097ae8c2c5c613a368f2b6297ff023b8d1beb0910eb6ed36dc5989e26988e1615da4e7d11637086d360998f26694a8c7d8023e5d73e7
 EBUILD binutils-config-9999.ebuild 1070 BLAKE2B 6150ea0cd80ef5b43047520976a6fad9f086ed2a860fa2f954555d1fce5462bd4c2f27b7008773bf875f65e7f01eed14c9749c30b7353e9010a543c6e0d3e9a5 SHA512 86832f3d65c7f8525924ebf3cc1ec746ba1828d33bceb353ed40a9674aa33726c0a7d07e509e1a5d68fee4bd33da773e290d0693933eacf945d339fdfd8a6c6b
 MISC metadata.xml 564 BLAKE2B 74266e85bc64997362d09b99d2b739dd5e78fce2a4329dd01e0d44c909743e1b384c62c3f87c62b5945b00b5d851077008fe6aa4e1c4944860cd8d9a84431171 SHA512 26117ff041aa4a5ad7c143d60fbf18ab08f73a05fcec58faa559b86f5b774cbe5cb260e8fb6a7b664947b2f722bbba976bd37b998c13fa797ab7aa04d46c4489
diff --git a/sys-devel/binutils-config/binutils-config-5.5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.5.2.ebuild
index 75a32dd28cc0..8a3e6e32b8b7 100644
--- a/sys-devel/binutils-config/binutils-config-5.5.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.5.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 0060e4337420..d04cbb0a1a66 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,6 +12,7 @@ DIST gcc-12-20240209.tar.xz 79824868 BLAKE2B 1ae5a646da470f06648c4766c77475ceb28
 DIST gcc-12-20240829.tar.xz 79907788 BLAKE2B d50f01fc6dc5962696062d0c5e0c12753e59030dc44e7b04f37a9a58cf675320151ada22f9d2796e15c3aa3d8e130afb4a8ab03112f8eeed5e57ab51c66e5cb4 SHA512 58cfef9a0c8bf40ec8ccbaeff1460c2e97fdfb76931e06e37fe067b14d52a6c0554e5b9706b937e1f1328c18a133ac61837d9ac52ec2591cd16353009b07aa6a
 DIST gcc-12-20240905.tar.xz 79894592 BLAKE2B 81e2633f138d19d4f96f2e9eb8f908183a9a172d422f1b4381909aadd2e3fb5302f5bb49bcc8b38cc0d32042a6c84141000423a701fabe8f4213c2e144539531 SHA512 f2d8fb19179d330300939c9441fd53f00b4e2595e4b1d85e818d40fd0908ae9867d314d9169597bd10db3655641790129d3c194ceff9a00cde441391d64b0c03
 DIST gcc-12-20240912.tar.xz 79889436 BLAKE2B 1ede51ba36e06cd3daa344c80e8ba1ddb9418080151692f6e687166262b60c41843ddf25b7860d5a5324b916052f7746cfadd99ad54b72fc08dd9564f83d4a0d SHA512 cdcd07cab2d6f41ca56fa2bad3633b0a5b3ae9a8cea769343bfbf2054f21ed28a7a71a8f0396dbe873e4264076a43a52e9289c76b1e1148050b64869bf9735c3
+DIST gcc-12-20240919.tar.xz 79901284 BLAKE2B cac209e466ccdffd84610e22961bfbdcd70f6bdd838fe595aa5157670f2a3b9d7db688ffe700e4e7f643a1d3dd806686531e519b2a750b942be63a7dbd7dcb42 SHA512 b032e85be5720ea66b6183f3a5d9f2cc8505c21a0fbdb44d292d8143e37b3ec6e8c3417cb8fc7a18e7cbc961d61c51f681b3ea724086d325c05e7918f7949063
 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-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125ad6c54f45dc9d770215eae3e9ea0db82a9a4f79c51b4d5f8461a1d730c17db6841bc31bd96dba11d9ed7544ae SHA512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853
@@ -20,6 +21,7 @@ DIST gcc-13-20240614.tar.xz 84463660 BLAKE2B a1b551ff633c31d6972fed173f248ba5f66
 DIST gcc-13-20240830.tar.xz 84496796 BLAKE2B af34dc5ec6a38948fce25b60860be2b87a381bb43dd4159fe174d0ea4566d2ca1b1830c3847139336ac34deeaac9d4f80832caf94f25622013f83c3c161e6b65 SHA512 3d8a531145062a22bca483452a08cc5218cb3af9a76828ff706d966c0cd122cf01b61705aa5cceb9364cf0fd0434ad9d32416d079638e1937513ef52d6a3b6dd
 DIST gcc-13-20240906.tar.xz 84500124 BLAKE2B 28c54c9df7fef6778f86edd4bc07c214666ad548e6e3ef30bfaf09df7f1dc6f1d4b6c51589746dff1ca2074f2fd63375c30c1c1b0e7e8b70c21e8db78af9de5a SHA512 32552c971aff250080815f3defce554529aafed4fbbd3486bdcf5895458d096260fc5eb7db451be581f888d93958c5fcf35e4ed14fa06fc990b2845e7f4fe9e3
 DIST gcc-13-20240913.tar.xz 84477732 BLAKE2B 72834bd1bb48f2809f639d9bed7f4a18d06fa1a7ddbcf882bd9e04aed4234667c048ede6da1e5f3d860fdc47b3d742bcab7021e8b20d85121ee888f92ba14f05 SHA512 beaa0d93800e20de1d1e69aadb911c8f28371db0cc96d36f6adf56985ed091223b0c2e698d72779677d0e0b6683a1bb6999db0db0d5df5dde2979325978519f6
+DIST gcc-13-20240920.tar.xz 84477260 BLAKE2B f9f0c376d2849a55a61ac5bbbdb456d160e861e8f0acb34651960aa680ec5e8e6d6bdbdeab94c02e51ad1766bd24e5f2dba3a386f6735ea103181dbc1348a943 SHA512 5b7304ea0032a3bd6f111c8da0a9f12958f45e9f117d408e02e8b4892157462c5643891bcedbded7386f5f9987d16a922bd21bd05ad33167379e1579b7baf1aa
 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
 DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249ca0119ad362747a82d886fd10f77ceb05d02e033e906a090c67f44b1977f40df6a95206d81a32dd15e2f5413c6c92496 SHA512 324d9e63d16c35d55edde20de049162c01b0d487b4548d06c49f0da04a761ec255bc5e020cc2e7f60d12f5d129768afdcf7c86a59126f71f388ab375c34be6de
@@ -55,6 +57,7 @@ EBUILD gcc-12.4.0.ebuild 1615 BLAKE2B 9751dc68e1fef6f6f4d2eaf487e709dabc498fa979
 EBUILD gcc-12.4.1_p20240829.ebuild 1624 BLAKE2B 9e97343c462ca9282890ce612fe814ba3c12f178899c47d929a8d9b0949ac99125844275176be6eaa22eb646771cbb545edba143dce098d9c86f6e1f9b828ba0 SHA512 e3d340dadb3059e2c769813031e44a77bee6ac6238378f0ffd593f3fc1866edf8c8cc27c17f01cf2e9cff47070cc8580a34273968fb7a3f26c8ab37d76334656
 EBUILD gcc-12.4.1_p20240905.ebuild 1624 BLAKE2B 9e97343c462ca9282890ce612fe814ba3c12f178899c47d929a8d9b0949ac99125844275176be6eaa22eb646771cbb545edba143dce098d9c86f6e1f9b828ba0 SHA512 e3d340dadb3059e2c769813031e44a77bee6ac6238378f0ffd593f3fc1866edf8c8cc27c17f01cf2e9cff47070cc8580a34273968fb7a3f26c8ab37d76334656
 EBUILD gcc-12.4.1_p20240912.ebuild 1624 BLAKE2B 9e97343c462ca9282890ce612fe814ba3c12f178899c47d929a8d9b0949ac99125844275176be6eaa22eb646771cbb545edba143dce098d9c86f6e1f9b828ba0 SHA512 e3d340dadb3059e2c769813031e44a77bee6ac6238378f0ffd593f3fc1866edf8c8cc27c17f01cf2e9cff47070cc8580a34273968fb7a3f26c8ab37d76334656
+EBUILD gcc-12.4.1_p20240919.ebuild 1624 BLAKE2B 9e97343c462ca9282890ce612fe814ba3c12f178899c47d929a8d9b0949ac99125844275176be6eaa22eb646771cbb545edba143dce098d9c86f6e1f9b828ba0 SHA512 e3d340dadb3059e2c769813031e44a77bee6ac6238378f0ffd593f3fc1866edf8c8cc27c17f01cf2e9cff47070cc8580a34273968fb7a3f26c8ab37d76334656
 EBUILD gcc-12.5.9999.ebuild 1592 BLAKE2B 67143f2363fc6565514d2efb407f73adb21d2a83f499abcd52a56084d5abfbe761be3cb5550b83b19443893b199cace3ffb0865ecc9340b63b051223e96aa105 SHA512 c7555fec9b7008cfa7ec50e64fe4f67f15ca55d8fcfbc720a4e640de90851aa13bd9929bcc1f1fc84d9cc59d32b407df6347f5bb1c232be7b2f1181b829dceca
 EBUILD gcc-13.2.0.ebuild 1682 BLAKE2B 5a19639504afafced19bd1ad913e3106a65d16b4b3d5aeabedb0cbc891bdac22d9cd0a21928eef51b88dcbbe64927fabe8fc9bf0fe19ea755ad5959bf5acfb67 SHA512 3865dff4bb19f022f6a1a2d653bc8f7eab9c47e99ec5b30e4600506faab301f410ff26f1155b5305f219f3b89f344cc8271aef8b6d6fb2568e8937d5867ea843
 EBUILD gcc-13.2.1_p20240210.ebuild 1675 BLAKE2B 762915c2d864696549d2d64e679c97859f7220e939fecc09caff0566693457837cb852a9d337ba1b47aa7f4855bd63c9a4e82a2f7ccc5d61eb19e7cb8a0ecbdf SHA512 9bfc10315bf601d952f8ae0515d6ef949c1446545dab355082987a78e6f27b1bf7e375b3bc4567399ba1622bdfd8b0b0fe55a0842425ed77ae9efc8a1573788c
@@ -62,6 +65,7 @@ EBUILD gcc-13.3.1_p20240614.ebuild 1675 BLAKE2B 5a69f99e69092e7691c42c8119813988
 EBUILD gcc-13.3.1_p20240830.ebuild 1684 BLAKE2B 37373988d53e286b61dacfac6da30deb1eeaf0b1401db7b2e4dd2c97847ea2b150eccfaf2a383f43c733e7bf2e32c2fe242d29e2d9d76bf74827c7f4b13d9c71 SHA512 4b636ad546a227d2195ffe0bd3652c0eadb2135ea4f91b2cadbf992d8ac9c0ee556f8664d66218af56ecf21f2fc2dae9174726c9eec3a32dcb71149537ac5859
 EBUILD gcc-13.3.1_p20240906.ebuild 1684 BLAKE2B 37373988d53e286b61dacfac6da30deb1eeaf0b1401db7b2e4dd2c97847ea2b150eccfaf2a383f43c733e7bf2e32c2fe242d29e2d9d76bf74827c7f4b13d9c71 SHA512 4b636ad546a227d2195ffe0bd3652c0eadb2135ea4f91b2cadbf992d8ac9c0ee556f8664d66218af56ecf21f2fc2dae9174726c9eec3a32dcb71149537ac5859
 EBUILD gcc-13.3.1_p20240913.ebuild 1684 BLAKE2B 37373988d53e286b61dacfac6da30deb1eeaf0b1401db7b2e4dd2c97847ea2b150eccfaf2a383f43c733e7bf2e32c2fe242d29e2d9d76bf74827c7f4b13d9c71 SHA512 4b636ad546a227d2195ffe0bd3652c0eadb2135ea4f91b2cadbf992d8ac9c0ee556f8664d66218af56ecf21f2fc2dae9174726c9eec3a32dcb71149537ac5859
+EBUILD gcc-13.3.1_p20240920.ebuild 1684 BLAKE2B 37373988d53e286b61dacfac6da30deb1eeaf0b1401db7b2e4dd2c97847ea2b150eccfaf2a383f43c733e7bf2e32c2fe242d29e2d9d76bf74827c7f4b13d9c71 SHA512 4b636ad546a227d2195ffe0bd3652c0eadb2135ea4f91b2cadbf992d8ac9c0ee556f8664d66218af56ecf21f2fc2dae9174726c9eec3a32dcb71149537ac5859
 EBUILD gcc-13.4.9999.ebuild 1679 BLAKE2B 480cd313584e1170b6948893bf6eaec6fed930db66038f5e0dc60ca279e7469ba41b416cb7e0261aafda3ee704815ae8d034ee9a523a46fb96f023621bc58446 SHA512 c34bdd3646469d69bea6457c4f91107ea22c14d9a0e75e4cd1b8b75297a8a5b073adf37c8609d62d00584fe6dcfa7cf22c460210d6550bb69dcffc570e9521b0
 EBUILD gcc-14.2.0.ebuild 1439 BLAKE2B 8526f59ddd0046bf73a2786a19a99cdc6a17ff06a90c76dd9466acacc1bf2f8932768ba8285b8687e8b27eed341bf644b4bb752c47b61ccdb956bb5f3524e546 SHA512 406a5d60b7115907313c5c4a7c06674244d3362c5f90a2c358e0feed8a8ff72cc0becc07cee6e82090aeea3f55db91961a300c755263d3aebabb0251b0052f48
 EBUILD gcc-14.2.1_p20240817-r1.ebuild 1440 BLAKE2B b641bcbb8a535e9a015d86ef3d0044849622a6903be80d10e3bd5628a39dd11f1c4ca1152d1c71db4c4bf7463f982e58a17a684d8feb477e0b9eb039bacdb579 SHA512 eba354815b0589c3b07f777bad2a6f4fa6f25c2f732d5e65e2c99d5cb0fd391cbb73c2c43fc9db280a97ab5e6e2506abdedb310b84caa3bd46d0bf90a6cfa434
diff --git a/sys-devel/gcc/gcc-12.4.1_p20240919.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240919.ebuild
new file mode 100644
index 000000000000..d6312b98e032
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.4.1_p20240919.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"
+TOOLCHAIN_HAS_TESTS=1
+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 ~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}"
+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_p20240920.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240920.ebuild
new file mode 100644
index 000000000000..bc9e058b8a4a
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.3.1_p20240920.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"
+TOOLCHAIN_HAS_TESTS=1
+PATCH_GCC_VER="13.2.0"
+MUSL_GCC_VER="13.2.0"
+PATCH_VER="18"
+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 ~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}"
+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
+}