5 files changed, 68 insertions, 2 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 21ea18dff594..7627b108f378 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index eb33bf0e0c9b..e33f3c7f427f 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -39,7 +39,7 @@ EBUILD binutils-2.39-r5.ebuild 14010 BLAKE2B d48c1b911b3a89899edf2c7b85f91b4c0e9
 EBUILD binutils-2.40-r5.ebuild 14311 BLAKE2B 0a1b763d772d3c5e783d27bb3b6ed9291b54239291e0647e1d6b824e2433479177a69acf2ae1f31a313a4f52996fb11c1c02bca7d2e1aee888505a6033439c63 SHA512 7d6b8e080c338e57611f3c0cc740e3e18534533005912acf89f017b302bbfd9b9fd4e0d9f63494eaeb51f5376550ebd57bdaa48f69863ddd387938a65145ab8d
 EBUILD binutils-2.40-r9.ebuild 14487 BLAKE2B 4e0d5ff6c86da083ad85b37b607ea5fabe4149e07f41251e59e6cd5fee405b89a6f3306cca21bae33bab9bd43c64fe93c6ef4ffaa77aa1b08fd714d2fb5f87a4 SHA512 05b24a4f174dcc27afe7ce4f18de319dfca6197f47f457da8ae6e99e2f7bae0fcfc26ad4d820f4b7975e056f69b83f4ea8cfa3824bd8e313b1ec78133ef051af
 EBUILD binutils-2.41-r2.ebuild 14821 BLAKE2B 38ddc81a48036856b55b8e25ed5595032bf388cf08c49c908bac6e2fb301e9eb3e13855de97a97e1f0f71ba5f1cd56b7555c5f3835c0d979ed3b59cfc571f277 SHA512 fa732d0021b15e68aee2d16b6863ffa0f45cfe33b75b9dbdc6036e3587c729d8e4096f2fa1a40fd04654b3693715d37ed9e860c2bfe19fd40d0e904c13d9a767
-EBUILD binutils-2.41-r3.ebuild 14823 BLAKE2B 336b59d242b1c26715a47e141ce4e7e5f491590093a92fd62e2e3d53b2f8bb660c2722c64cd8f2ac6c39240e7e6d7c159b126b0a735d51dab2eb5959cc1853ba SHA512 7e79a7f0ac06dd922bc40c09c63319ae974da2bab67a668deb3a9d74b7e04ad7a431ce0050047070f12ba165117c7b0391817606aeb7d5a03a141326391bdfc4
+EBUILD binutils-2.41-r3.ebuild 14822 BLAKE2B b3ab64251575fd29b49fb63745eeb70b28e34cf403fa4b5587b865e1d1459935c38219df584751d320dd00f9527c43ae03d5b83f0ec9edb4640ffec1d4f50f38 SHA512 e4e087099084e7bfb2b6e982874616a1040a25ccd8b06fbdb6618b6750616fa74c3eccb699e609e046591a7122cb5ea8105e07b8bfccbe41de1190783f30b7de
 EBUILD binutils-2.41-r4.ebuild 14979 BLAKE2B b5b7035b4f9917738147184a3351b46ea79b7a19c48ff84eb7c6f787ce08121c0c628d433528ff4d4de1af9a841ac5756e84598bed5761e9900ae75dd38ba098 SHA512 0adfe43eb674dd2885d6e0a461834e8bc99953770ef1e7d7d7b8dd846169c214d554dbe86c58daa6c7b96e977fe48f9b115523685c0ef69d49f83cfc82210445
 EBUILD binutils-9999.ebuild 14980 BLAKE2B 200bcd1be54985b4ef0d87479885f339d44297c7804d68e438baad807d0a050fa96f8eab8266f7720ce8692a0fb0a15aa72d3d2fed29ef608343cdf49bf0c7ec SHA512 0705f8745c9369431fd4268492e8c399548b5177041e2803ec05d9be47f2ad3b3215fc2d0baebbc32d03ec8bc688e4b010113851481b4b1cc070baf172b88105
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-2.41-r3.ebuild b/sys-devel/binutils/binutils-2.41-r3.ebuild
index 15bdc6f5a779..40af8cdfa5aa 100644
--- a/sys-devel/binutils/binutils-2.41-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.41-r3.ebuild
@@ -32,7 +32,7 @@ else
 	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 #
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a8660f05f189..9508fee9c675 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -39,6 +39,7 @@ DIST gcc-14-20231224.tar.xz 87027056 BLAKE2B 412a0e8c82063f3aac828620648e5a57942
 DIST gcc-14-20231231.tar.xz 87027004 BLAKE2B 55c12dea8b446793667220dd17a75f3081f1ca6608654f1d2c5860f65d757efa4dcd044e9f15373ec7afc89c475876502529abbb96ddaac77206c0a63ff23882 SHA512 79a704d54bd8ace8ebfbf720dca71c70dc7c1d0c70f8f586f70fb476006317846aa29a4754a3f34ebbbe436f4e548a4837f778bacb86f97d8bfc03627bfcaf03
 DIST gcc-14-20240107.tar.xz 87072048 BLAKE2B a605ea26af2e98c17f8efd742e8adc27f03a183d77b107ef74b30183542d44d68ee88cb975af1c45c6098f97b34aa9870302450de0c848832ebf49a4533c20c6 SHA512 6e8ec11feeca073bc4c24aca3d7ada4ec66780ec00735deab48df050d3efa1bfe8bfe7a7c58ab7ada4f585ef829b49ef80203e3251fc4e6bca0d0932ab2fb313
 DIST gcc-14-20240114.tar.xz 87220100 BLAKE2B 96d5196f07b7ca310baf800d2406dbf1a07eb85d6678ca16387551e04bd94f975dab817c7dd171a9e846c032f17c27b7141f5815322a4a3cf4dd3d1b5f583179 SHA512 422b81c9a7ac560865e6d1b1ad94c5bf269ab33ec4cf6e88874a1652c6e911877e926ad7a8bb2d79112eb175dbe6636e640b42fce2b6de7c7fc4f1d10db31d15
+DIST gcc-14-20240121.tar.xz 87469416 BLAKE2B a146f6f62775d2ad82f93dba0581b3aee162113cb0a1ed9fa3db6a8cfc08415555edb0dd0b24d6f4676b91d644d2096ffe22de3c03c8f88b7d6e480515601737 SHA512 af6b623bba274970c58da8cd4a5f329a2b2973cb108e7dc7a910358d7bffb89b8f33437d47d7f10a1ceeafd744f099677621f3c3fac65e54aad1ea4045d19743
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-11.tar.xz 11272 BLAKE2B 81c63b8aebcfd5b33b698ef4ef8f2d12b94ea2753ecec2b160cf9fab534dccd12875bcb16cfac2aa81211f8d9ff530cfc18f486567721beac487e08daa62363e SHA512 0f51352cbc6815cd1dbc8b73e9c83842a58242220ba712291cc76c08c19b3a612c88a3221b2da437a9c7ecb410a83c2e538aa1984b733f444843bdf79d314a71
 DIST gcc-14.0.0-patches-13.tar.xz 47572 BLAKE2B 8f0fc6ba8f9310eab3f6b568ffce39f64e399552ed5c9fdd261e3cc9292200e7ab66724872b392f64bd9bf05ddf9a1fd26ba4092a98d991202b4f6a28861a829 SHA512 a56abdd95f03ed0586df709fdc28cc6af4573465b99750502986efd7f0ce73fd8ab455fdb9621d9227e835721be3cf42a9997a97eacf148b8a0dcf3ba44cc5be
@@ -82,6 +83,7 @@ EBUILD gcc-14.0.0_pre20231231.ebuild 1596 BLAKE2B 98b65e35ed8715228da714eb1dda7a
 EBUILD gcc-14.0.0_pre20240107.ebuild 1596 BLAKE2B 61823820f769a92f02927416dea3b438c38094afd1fd34ea1010f6c99c345db7dac442130f081be744abf4aa8227b0f7f2e18a2c6db91b9caffa34e32dd493f3 SHA512 79fec1eafc773e07ba83b62b0d8cd8f05d9041a95a89e704b78e802bffbf70322f12d4fe1ce1feeda4b36904d263d7c5ec58e3ecfb1de304d29cddc0ba5190f8
 EBUILD gcc-14.0.1.9999.ebuild 1568 BLAKE2B 1a8a6f2d8236b48c81504d7462b2f1c4b8ffa98f635bd037c085ea5c9db2a448afd3a669f9f2b312de19c5e6000e47fac98d7eab815f103cdf07e352404cb822 SHA512 26f18580dcadde442995d6258d7b882cb355893d3e01f6d283e25c7df1cc28afc1988f22998934133b44752e74b2c479cec58a1e031dfe2ac2ba2271fb2e1285
 EBUILD gcc-14.0.1_pre20240114.ebuild 1596 BLAKE2B 3b27f6ad95410d16d4b0a3c904eb5397d807ac3e62fcd22f6494996f7c6f9963d17be08c3f0eb6867683d503d9808c065452cef1d292a0e4fdbdfa1d85a8c218 SHA512 9b6fb3ca28de09b976326922985e0da406f5ca4929ee8bd65d56276ea49eb8442286348829b9c0da63d9660e9909b2bc241875a3d6206b907e965ecb41430f27
+EBUILD gcc-14.0.1_pre20240121.ebuild 1596 BLAKE2B 3b27f6ad95410d16d4b0a3c904eb5397d807ac3e62fcd22f6494996f7c6f9963d17be08c3f0eb6867683d503d9808c065452cef1d292a0e4fdbdfa1d85a8c218 SHA512 9b6fb3ca28de09b976326922985e0da406f5ca4929ee8bd65d56276ea49eb8442286348829b9c0da63d9660e9909b2bc241875a3d6206b907e965ecb41430f27
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 1206 BLAKE2B 262931215488db54cab2141549f997a48e22d0a917917eb670d41d5b155c7685e92eb1bc3843d2eca47dd15a450199aea5d99777d2870ff09b1a79ac8a63bcb0 SHA512 3737a70e70e53a581280ff1449d7d92bb9ffba0919b618ea43d4747e09b2803795a05c07c0e3a2ec8982f8d5594be58f9ac549d329b18dc236ad5159e4a47132
 MISC metadata.xml 5028 BLAKE2B ec00e09a2015bbb5a54040bee9d6f06aa8f29a99541cf6719aa249c9e93c3db480b351ff72e164120c7df12acd24db46fedb5de4d88f609113d094d8f2fb6ea2 SHA512 0cb15afedcf93b40a0cb2194ffefee439820dba5fd779aa7eec00448943184e0f436305645d5f04c54935587004f1ac82dba76cc9aecd16f2043ccde7e20b343
diff --git a/sys-devel/gcc/gcc-14.0.1_pre20240121.ebuild b/sys-devel/gcc/gcc-14.0.1_pre20240121.ebuild
new file mode 100644
index 000000000000..777f9c46c49d
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.1_pre20240121.ebuild
@@ -0,0 +1,64 @@
+# 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="16"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+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=">=${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
+}