5 files changed, 113 insertions, 1 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0bc3f0f5186b..629d98114a40 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e4a82eb97e81..4317d2610d5b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,4 @@
-AUX gcc-13-fix-cross-fixincludes.patch 854 BLAKE2B 3dc52dc6b1ed7e86ae5a0a48b79dc5020f2abcbb4db6735479595ce88e259eb8fe933a5619408a29997c00966481f5b3cd3a412eb63517aa26b6babb3afac612 SHA512 666f9343594c5ffa4ea01e7cbfb8c79d95ffc3a5215dbc16a3f964cb73de552863aa578758d2ffcb0dfd36764ec65389b5abacf6dd12c941c129f39c8117fff2
+AUX gcc-13-fix-cross-fixincludes.patch 883 BLAKE2B 1ae33195320754c55f42e1206bcfdf98914af5190df5939a4c7b072a2bc25216c354ea5d76f5171e1b8a150ca7764bdf57cea1bc137c237a5e8bb44713885f1b SHA512 ca9625001f0a10826d75691fdba35ca5783ed2f80e605b935785f8dc7591b0e650dca28bf1fc7e688e27547dddc7ab38232459b4f1865ed10a148978d0e09703
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 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
@@ -40,8 +40,11 @@ DIST gcc-14.1.0-patches-2.tar.xz 11400 BLAKE2B 8698d9521b193a03df20b68b70bc8d2dc
 DIST gcc-15-20240519.tar.xz 88058724 BLAKE2B b9a9a93132fac8f827cd9f293fa09a4705084a420072da27161792a9c5f84a8fc9f28b15e878a5e7872579d4e89ae2e383b025d0529cf9e11c7f87454d61d62f SHA512 00eaf263d3eafb8b1ff101d703d9d82a770a79dd5484a6e69adb53889313ad300b65ac5159564950921985178546475cc26d760395ca68b4a6d4433ff26a6ffc
 DIST gcc-15-20240526.tar.xz 88091872 BLAKE2B 71bc733910cd334227ea0b78770bec9b4253b04ae7673c8f48e92c8c3322ecb2c4169b0d15df7a2f8fb222fed379c84fcec632d211e6aad815b56442ce28e9fb SHA512 65b948026bd558d5e2c70f76f62a4676bcd37d4d1201871f473d7f0ee32faa2614bd64f52090565c46e310032c743328f6182db97de874556c872f4ec0ff2ec2
 DIST gcc-15-20240602.tar.xz 88177484 BLAKE2B e3998b5608e4d6d7fed79aa41ee8dafb7165da3203823dcddb79c2548b4356900153e2135e42794eeb7097f2888b5988b7fd451ae1436b2f41fa227f1c59745f SHA512 dc9479f4171daff51a2df55cf907efcdcf02d4d91bbb50a7e1e5c64232ebd640ab424558fe8c3df50e70421b336ca66b1b02e0b59d5e3d07a13e1c97cee7b696
+DIST gcc-15-20240609.tar.xz 88288628 BLAKE2B 25ee6b2071fd189d5099160a1b9594cd0cdf6075a733258a61c3586f043d65a3e8ec22f1c2084c50694008d647ffa43895ed58dc655c41f296b98d136951c57a SHA512 058fae65f7cd398cff43282b9697497dead93401a7da47e63561bf029284b4b890f57f2ec74ef7e3ce7d170a2e69dfd5090b6465029360ab872222db037a9127
 DIST gcc-15.0.0-musl-patches-1.tar.xz 3596 BLAKE2B 48fddc723ec8282cc2704c795a50fb37a46738a555151e0430180dda61d039fe96b29a6c3e8a543386d69690302bf46dfc89aad572082b7e47c928c0ccefdeb0 SHA512 e43284d02e25b77b911ce90d57520897751e86c631bdd6beb7d2e4429000156801b8c11bd9a737ec11bc966812f13ae44b88c1893645f8e6c6f8dfddc636ec39
 DIST gcc-15.0.0-patches-1.tar.xz 11588 BLAKE2B 0623914dcf3ee0d44c729776cebbecfe92b256039a48c91e3fc16a27254a9c40436a1b6ea7fa9285914b153af861ea98ab845515169af204eeea0243c890a652 SHA512 7d3bcb1adcfa79c1672737125539fc0583f9c74eb8da0301ea0e441c68afeb7e1dbcbdffbf18e03b2515b4f23822a39e339298cf88ea94b93f5fc22b497cd545
+DIST gcc-15.0.0-patches-2.tar.xz 11404 BLAKE2B e7caba8101e55ed59b8e18a6f062c699081eb764bab40c39dcc70c058002773b36d551ef8d5b1c35bf68bfe2f5b6917b0fc4b7d647a6fcf0d6b321cec7ac0185 SHA512 41d900ded125702cefdb0ec6688137b63209db7f26bb812207df987c26de64dd1f63d6513632b33ef60ae1e3b0349512611218eff2f80f9a5ac88fcff3e29354
+DIST gcc-15.0.0-patches-3.tar.xz 15668 BLAKE2B 99c332c7302bba0a790192bfcd81b8a273002884a2a89fc03f61d46ef669d9ba49496806400f86131c127b960862b97296148b6a0956946cc98470397c02579e SHA512 f0effdadff0fc553835c13f0dedb903374f021d172a20f01e6e3e0a39495ead96229665ba1a82f0aa1e9b49c6ff367f5c6e2c3e336a84ca02efb96f1a373f18a
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
@@ -77,6 +80,8 @@ EBUILD gcc-14.1.9999.ebuild 1453 BLAKE2B caee7ba2e0323b0953b53c822cfe76c70eebd46
 EBUILD gcc-15.0.0_pre20240519.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240526.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240602.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
+EBUILD gcc-15.0.0_pre20240609-r1.ebuild 1402 BLAKE2B 773dde45ccecbf9f0645b184d3f8200c2b6876ed11aaeda3e616889c4a5fc44db1a76bc640cfe4fbff094ccb93d2c89130baf4bb053cff25e794eceb88d95682 SHA512 1b2a9b20806a57fd90ff8a100c393586b70dbc308d825823c9c680c62a2334d2716678f2a6faee1f11044e8f6a7c0f4617d1bfd8b98a49c0e257f2dbe6ffecfd
+EBUILD gcc-15.0.0_pre20240609.ebuild 1402 BLAKE2B 78b10af75acdcb02a0a0c37af400a1646256255e1d14530660594c59e5a4ac1f7fc1c7600ec83a8046f1e998137b6b0f16713dd23aca5ed3639ad92b963f07a7 SHA512 4ed135bb568f679238173262c545781b8e402aea8983619c656fa6ba73cfecb0fdfd52b8b29e38de6ccb07998fb6839b4dc6debe5d36118c348ef8c50cfa0c21
 EBUILD gcc-15.0.9999.ebuild 1375 BLAKE2B 713f557e8ccda4a146eb0286c1d42c1ccf144937450190dff66be5a280abc345951cd43c563f3a3436cdfa5c9e6a077d59132e3f8f7fc9d472803b8024624abe SHA512 624abe83fbc0654e5f2104fa29499fc26ecdc8d5a923f653981c79f93c982c1f43bb75005b61239bd1fe8490d1cf64afd28a454a5d1bc72c51369cde1656524a
 EBUILD gcc-8.5.0-r1.ebuild 533 BLAKE2B ef3368f7236352e8ddd5b56919cd2145794b0385f35e4efa50808aeafd98687eba5d32264a3fb2a34d85b5d913697e93af58eb03ce35b6b5ba45d78bb8f33d25 SHA512 528e4b7389f4053aa177b8405469963358c5d595fa257115fa94e5e26a54a6c3b1c15bb847bb97864dd387fd2681f16907aecf052fad9315dd91863ac419d10d
 EBUILD gcc-9.5.0.ebuild 1241 BLAKE2B bd30abe9c99e317edcf7ae6ce8626a4c27322deaaadd510f02d0f36422d892eed896cb0ede817c1ee5bd2f5b913f2c426ed2ebb5bb8c2d455a1bbb3531f49eed SHA512 905224e69370a065c1f6b72b568418a231fa47f76085291b4eb3bdab741a64d1e454b02064d2afb4a91c1d935c58e8d299485b33fcc4fef8db3531967f6fb457
diff --git a/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch
index 6d1681938b07..e0e5a3ab9b9f 100644
--- a/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch
+++ b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch
@@ -1,6 +1,7 @@
 Revert of https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=59e4c98173a79fcaa2c33253261409f38856c384
 for now to fix cross fixincludes builds.
 
+https://gcc.gnu.org/PR115416
 https://bugs.gentoo.org/905118
 https://bugs.gentoo.org/925204
 https://bugs.gentoo.org/926059
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240609-r1.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240609-r1.ebuild
new file mode 100644
index 000000000000..13151f81a816
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240609-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="3"
+MUSL_VER="1"
+MUSL_GCC_VER="15.0.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild
new file mode 100644
index 000000000000..187ba0a09260
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240609.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="15.0.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}