6 files changed, 110 insertions, 2 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ae079553c114..8255c23f8836 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 0c96f937ca63..775c18f471d9 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -38,7 +38,7 @@ EBUILD binutils-2.38-r2.ebuild 13134 BLAKE2B e2e1805917cb6a6ee19c30ad3b9bec5daaa
 EBUILD binutils-2.39-r5.ebuild 13655 BLAKE2B 28c078a099015b084637aae637a2c346eab4156f8b94842fff790dbc7004049cbcf7a71ec9ad2b892d4d89d1377a7f3876514e6de167adab9f98639cf17e4763 SHA512 b7f3aa7252f6803afabef0d2434151cc381023ac41ab0a0771dd2480333c4ff5ae59d0211603261ab5c5071f4281fbaa9190a172fcefdf3eb37c70ced3f737f6
 EBUILD binutils-2.40-r9.ebuild 14132 BLAKE2B ea7d8298ab644f3c4d1c2ca620949cef1f2e146243052eaa50545ccf46bd63858265c00169e0440e90cbefb8d4e16cceb64d709074dcdfc1c257a4760baa2196 SHA512 0396cf41ca211169afc106efe15c8a009e354d675c21a42b73aa7c1feab785e9c927c034ef86b92aba57b4a422189838b9c51a3e864be82901eb535da331a7a9
 EBUILD binutils-2.41-r5.ebuild 14654 BLAKE2B 2049e8618a6aa4385bf036726a027cc2e58ce1e5e00d35d1d9926846f0209fcfe958d42e7ad4de6ea474bc8dd728c6f8d706121867e2c39e1404621deb15a1af SHA512 feeb65fc8ed360235fddc9d287d4aa28109ea60504283332940133eb40bcc0be5799a400c1da8aa7cf0e4038ebc8619ee225d6baf83ddc9f1d923c2ba2ded675
-EBUILD binutils-2.42-r1.ebuild 15575 BLAKE2B 2f260c355e3c45c62c147aaf5db0d47f26c06563f28c17e0524f8845d286651b9cb7ce4a2fd02863cfe13a369bc59cd4fbef9aceca84b418273ee471d3e7c001 SHA512 45dfc34d34c7650a305d38b67bd6f03ffc9002304d95654f3dd0eef8bef0da9c1e9c3693e68cc86c98c356cf138e0aa9d544fb5d11d85a3509dc8bdd96831330
+EBUILD binutils-2.42-r1.ebuild 15573 BLAKE2B 519d29431da4ea9c3d04e2e8baf923135d42042b8e1d06f57dfe58166fff618e2a790a64471d99ffd74a652114ce7382d5f546feb3e1484374f02e63a2f9d36b SHA512 9ef4b4df659786205130f0010407ff7955885fdbc09c696d85b62663e75b09dd01a7255b526fbb082c0c319d8f5603f6a46c7292a04e7f6f2394713d95386974
 EBUILD binutils-2.42-r2.ebuild 15581 BLAKE2B 36a605fd116d060834782bb7cacf0e68b2d93f11f2e442442133383d1db0ac0193a13f08616012d08f8dfa2e18832116bf8aa57c3d6939af6450c00d0e104b8a SHA512 2bd3c1b8daf02faf92f58569f1c118b0d26e07eabc03f4dc4d7c472b2689ee090a0fc020be9e8ff8d210be12e9b7eb5559f90fa75a9a16283d8f559d87a78810
 EBUILD binutils-9999.ebuild 15436 BLAKE2B 4df710f05023146e7a1a38da7868ebf3af718db104d61f7981f359173165b1aa2e05b0b982d31e7efb4c65bb8a0d6150964e20fddcc4967095ce225e9a527caa SHA512 214a3018afc8ad98421f7597dd2c85ff8e53579248bd7792afdc4bd1ee0f08aef880eff3ca60fe6e8d2a0767793d9c4edff2ae60fe4129a2b0e178388da9999b
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-2.42-r1.ebuild b/sys-devel/binutils/binutils-2.42-r1.ebuild
index 06777566a77d..6035c39f55c8 100644
--- a/sys-devel/binutils/binutils-2.42-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.42-r1.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 3ced29cf1bb6..002383975d7a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -51,10 +51,12 @@ DIST gcc-15-20240616.tar.xz 88348980 BLAKE2B 3b2cc25b55167e371687b7325de14f088cd
 DIST gcc-15-20240623.tar.xz 88407680 BLAKE2B 4916850739131edff5a144f9c75a95d45819ce236f079096ecf2e81a63dd1760a2c761a5db822f4a643f67e85efd10e63490b88fd099c3663fa5bc05417a0b8c SHA512 e0cd49b0852841c290d8a190d75740047aa87ba2c614adc575433d3d1f2e975f5795d78af8b9c125dd600eab233abbc1e2ec4ef71abd017fa3b1c4b2a72bc601
 DIST gcc-15-20240630.tar.xz 88427396 BLAKE2B 641f8c3622749d80cc9cbe7e2365b3366422cb1561e2fc88a890b933649b76a0326bc8d211e0629c39b12e7c9bf5e005d83f0d674cfefd4e32f8414ffaa04920 SHA512 d7e50f13e4e8045d3ea9169cabb5a15eb1b2b5a99d0a418dbb1231f615b7c4cd55ad2c65945a808b2743f508cad8b2100c40fb750de5ccaefb251328adfb7856
 DIST gcc-15-20240707.tar.xz 88446948 BLAKE2B ef0e1b91a971e71a8128b9c1732aabfa1004a44dd7764f527d8b00e4b71e66fdac5d0ae09aa3b69fc561b8b66b06e7dcf2b8ac49385e49b3de317da046132ece SHA512 44a8cf370c8fa187724ff52f3441110a53712a42eab855c592afea5ca35d31880561535eba5d78e6e50fe311c95886ce622c7d2c7965bbd6c42d05c79178fa99
+DIST gcc-15-20240714.tar.xz 88493908 BLAKE2B d11436fcbdf3c106e3de706514d4a48a33255ab1ac03d1ae25531415dc418007f391d92a502e12ab6ed31f573431cafdbbc97d153d7481b7455e380582f4518b SHA512 e2b9f3765002b670a1cc3be88e0e99ce710fe9cc1fa06d43026bbb2e2795c9955b0283a1a18d32311e82dc28efe6c67a93c1fd7ad5ffeef18f260c6aa69cab6a
 DIST gcc-15.0.0-musl-patches-1.tar.xz 3596 BLAKE2B 48fddc723ec8282cc2704c795a50fb37a46738a555151e0430180dda61d039fe96b29a6c3e8a543386d69690302bf46dfc89aad572082b7e47c928c0ccefdeb0 SHA512 e43284d02e25b77b911ce90d57520897751e86c631bdd6beb7d2e4429000156801b8c11bd9a737ec11bc966812f13ae44b88c1893645f8e6c6f8dfddc636ec39
 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
 DIST gcc-15.0.0-patches-3.tar.xz 15668 BLAKE2B 99c332c7302bba0a790192bfcd81b8a273002884a2a89fc03f61d46ef669d9ba49496806400f86131c127b960862b97296148b6a0956946cc98470397c02579e SHA512 f0effdadff0fc553835c13f0dedb903374f021d172a20f01e6e3e0a39495ead96229665ba1a82f0aa1e9b49c6ff367f5c6e2c3e336a84ca02efb96f1a373f18a
 DIST gcc-15.0.0-patches-4.tar.xz 11440 BLAKE2B 8b7379f91ac14dd1e496de744d221cb0ba1802c14ce32cb90e6311ca7a60cbaf488a57060673e2e9d407eed6d3c5b092c1ba6da27036d35e0c78a7ac8a5f5ec4 SHA512 92e8895ec1c6054b46581867f3e49bd2d574043ae82ca441e2b48d9ed0e2dd5c58baa53ba605ce59a5c1d59473ac0d79c0287e5b47d06f0a661c655a19a4a5df
+DIST gcc-15.0.0-patches-5.tar.xz 11840 BLAKE2B 9af335f7e1795e600eae742ac32f5ff737f157aaa35902227ba29b28013c95bcf5b2b1345a21c433bc10f4cfbfc267a595b6ca90ec2723f7f24fccac3f7c0355 SHA512 8cc8ec574640470780711bb5f6163f382c23999152c229d86e1143e03275a3147bd1fc0cd9bf3642a2402333ec565d30b90a6e367284b78ccc580c6721aeac23
 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
@@ -98,6 +100,8 @@ EBUILD gcc-15.0.0_pre20240616.ebuild 1343 BLAKE2B 19a9d4f8770afaa4b96760f9524b62
 EBUILD gcc-15.0.0_pre20240623-r1.ebuild 1385 BLAKE2B ab47992d6518f1cd9c0b34fc81ecc7569b50be997cbc0f1194048245d48d6128ea309e4905579cf38f388650731261d4020a270b281d2806b8305fa75a3678fd SHA512 80fa2d3bb9c23fa7c22416a5f4219690c3fc770ff13fe70aa4bdf43f0d9a3a3af8ab45f58da36e71a26e25512014b0a92ed950319a248ebabd5dcf91d4878bdb
 EBUILD gcc-15.0.0_pre20240630.ebuild 1343 BLAKE2B 19a9d4f8770afaa4b96760f9524b62c43caaee874b9e5f34c44ff6cab058b37ef9b7b4c3726fb70baaf76d501888014406c00b9c468c1deca456196b89994fa2 SHA512 27228f7b9a0d1cc9f7754012950347434b77f6a5596985a039291e40f472ddc97700e4389ef87cdb5280172918087c0fe195e7035850f58757c17998f73363c5
 EBUILD gcc-15.0.0_pre20240707.ebuild 1343 BLAKE2B 19a9d4f8770afaa4b96760f9524b62c43caaee874b9e5f34c44ff6cab058b37ef9b7b4c3726fb70baaf76d501888014406c00b9c468c1deca456196b89994fa2 SHA512 27228f7b9a0d1cc9f7754012950347434b77f6a5596985a039291e40f472ddc97700e4389ef87cdb5280172918087c0fe195e7035850f58757c17998f73363c5
+EBUILD gcc-15.0.0_pre20240714-r1.ebuild 1343 BLAKE2B 9b3d091a2835e9fb2c44a8ac9af8c62ccf35da9b153b7e37091b7e4abe752943c70cde901b46865836456b4d47e718153f7a72049138682ab0f628038d167a8e SHA512 2bea3f8026a56adf799953bdaebacc56f460f69019657a765df0cdea3372a07f8eb00a88bec296fb90b4eef42d0dbddbe8143d5e0a02d552aedf063ae98b4f64
+EBUILD gcc-15.0.0_pre20240714.ebuild 1343 BLAKE2B 19a9d4f8770afaa4b96760f9524b62c43caaee874b9e5f34c44ff6cab058b37ef9b7b4c3726fb70baaf76d501888014406c00b9c468c1deca456196b89994fa2 SHA512 27228f7b9a0d1cc9f7754012950347434b77f6a5596985a039291e40f472ddc97700e4389ef87cdb5280172918087c0fe195e7035850f58757c17998f73363c5
 EBUILD gcc-15.0.9999.ebuild 1316 BLAKE2B c1c75602d7c6033c7a1083e57c28285780f20e8349a754d72ae1a306e978816b42be4234e3080c8b8ed1474845f7bc90014d920a9dc3d55c92a822db2739583b SHA512 7153a3ff4bca00aea9e1b61c972f549adc1e09adac36b02181cc53c381eb092471b07480348664140cbb2b01e91abe2605ae5d44f7aa854d972f3e2370c6f87f
 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/gcc-15.0.0_pre20240714-r1.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240714-r1.ebuild
new file mode 100644
index 000000000000..c843d5c92e61
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240714-r1.ebuild
@@ -0,0 +1,52 @@
+# 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="5"
+MUSL_VER="2"
+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}"
+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_pre20240714.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240714.ebuild
new file mode 100644
index 000000000000..0e7089de681c
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240714.ebuild
@@ -0,0 +1,52 @@
+# 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="4"
+MUSL_VER="2"
+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}"
+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
+}