6 files changed, 157 insertions, 7 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 302ecb59ae21..6dd9916a15ae 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2d8323982f6d..4176d8844311 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -44,6 +44,7 @@ DIST gcc-14-20240803.tar.xz 88016412 BLAKE2B 60301ac6acec9cea3001fda41e0dd10f669
 DIST gcc-14-20240810.tar.xz 88012840 BLAKE2B 85f6513f4f4a001894fc22df6c53ce20d6af547191478d429da152f163406c6b320599445a58bef1e79bcacaae56b6bebab9bc9762a75c82bf65dd502e4e7048 SHA512 2b1fde696c9e97a15e9b3550145c74d031d6ad667ac62b51c11bc9e111caf229c6fc4530a18d876d31ab7554fc51263944b8c0182533b1e9275132ec6ce87887
 DIST gcc-14-20240817.tar.xz 88024252 BLAKE2B 994b3e263246e344c6898943a17feb63f07b3de02777a77c689e001343119bd451e1ed5c6958f368077f10b4778c65fa492c55d164e2a0b1bbd65b275aae3cd1 SHA512 31de06694efeb2be49b64e9e8314a766d36c3d5f5f2d52d1e0419ba69262b7c344ef0700957eff11007ba5b81bd5e74dea2a2c0286990cb33927bac4a7db9756
 DIST gcc-14-20240824.tar.xz 88019780 BLAKE2B 8da729548e785196e1efb9e1d0ff522423196921e14828defc4c6bc176ea13c5fc76515bde7c293bf80025b54b6466b0ecd7e5ebda4307023d74704a6f19bdf6 SHA512 4ad87ded2468d5303e0a7dc51e85f82eb53c1f26aa2bcdc7aa341a159f0c2fafc43d32f1285f7fd8b359ae67e949c4556df73ba2bdcbbb05f3f8d9488052b081
+DIST gcc-14-20240831.tar.xz 88125404 BLAKE2B 947ce02f545ad93d0ee4afcdc7cf7b64ef1cea2cdcea2120789d82370bb8fd0e7e34daf5d7a85e10318147367ef18059cdd0efa232cb4d409e8b4317ee4df800 SHA512 3d92b29c2a0f3c0e6fe043bf5d67d5928daf045538d4925aa6bc0bcc77a9e8bb3667f9d1b2337c56de35ca19203972a770c5afd077f69381371e7072313744db
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-3.tar.xz 11868 BLAKE2B 06d079766bfbaddd066cd70f2d3f5e9ef17f3617fe90de4cb0a9562e6c3b2dc46d94dce03649f2e530c21e3fa0e0e6e5aae3c7b768bd08717c4f29ff29b00a04 SHA512 636a2853b5bf057fef262d54bcb250f3ebf63c600bc184cfea499783d254c462f6c0ecf5f0c5dac6634110ba0d11193fbfb96850ac27fc5a318f1d810f2231cc
 DIST gcc-14.1.0-patches-4.tar.xz 11620 BLAKE2B c819fbdea1f3bf10c8d4214d4c33cf28c1410171d2833b6f8c1225eeefe749ddb815067b3fdb750e5839761aee8d39ffc51ffb492f88e630076818a61b18362b SHA512 0d6e1b04591607dfc8022124b186ce499467c32db7667ee1a640fe2e07706597edc0e4ad5c7ebcb75c8f5fc6e45e9b9ef715402c71ff9ab21fe380007fe5d84f
@@ -109,6 +110,7 @@ EBUILD gcc-14.2.1_p20240810.ebuild 1424 BLAKE2B 4be63d21fa7ca87116c82a7c9c9ec66f
 EBUILD gcc-14.2.1_p20240817-r1.ebuild 1424 BLAKE2B 757e83e2a0d2a4b119ee0d1bfae9342ca912d539c5d39e670915bf61ceac9b11dd8cb7022824861f241a173461fcbf175fe6ad370fc82b5fe813996abd718228 SHA512 bb2306312799c87361611cd05fd7ce6cbe2b02dbe68454f983c8703870032deb88ebf7b947bd5bcc3b428bc7565159c5a40a651240b1f10a1ba840ec32e00904
 EBUILD gcc-14.2.1_p20240817.ebuild 1423 BLAKE2B aca2b0af18a0b6f4804f449f94063f2752bdf7619f1344772f9267a3d93b61d7c76196d3be96bf3f9b7aa4a30768c064f9a72bc14496959379a9c084691c6f23 SHA512 b5ede6a529624b73cadbf1637cf9f589f20562b5f499c6a6b4a6b0831c3cc321b031afab586a0deed7402a14ebe0e94e13a45f5e19f03f5e58037512bcf2dbd1
 EBUILD gcc-14.2.1_p20240824.ebuild 1424 BLAKE2B 757e83e2a0d2a4b119ee0d1bfae9342ca912d539c5d39e670915bf61ceac9b11dd8cb7022824861f241a173461fcbf175fe6ad370fc82b5fe813996abd718228 SHA512 bb2306312799c87361611cd05fd7ce6cbe2b02dbe68454f983c8703870032deb88ebf7b947bd5bcc3b428bc7565159c5a40a651240b1f10a1ba840ec32e00904
+EBUILD gcc-14.2.1_p20240831.ebuild 1424 BLAKE2B 757e83e2a0d2a4b119ee0d1bfae9342ca912d539c5d39e670915bf61ceac9b11dd8cb7022824861f241a173461fcbf175fe6ad370fc82b5fe813996abd718228 SHA512 bb2306312799c87361611cd05fd7ce6cbe2b02dbe68454f983c8703870032deb88ebf7b947bd5bcc3b428bc7565159c5a40a651240b1f10a1ba840ec32e00904
 EBUILD gcc-14.3.9999.ebuild 1394 BLAKE2B d0a952b4d4dc5032efff8717a2d14e9d57c995847f77e23d9dde728c4ea859c6a15f6407aa87615a6dfa64ff0bcbaabd073f4b975c051632563e70247d336f90 SHA512 06bdc87af51e16a76beac56a8d2cf3403627278b3e6fa9e791f36614c1c3f5473bb75dff20aa8fb2c13d14f78dc0540a6e48e1310ddbf54335552261fa53629f
 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
diff --git a/sys-devel/gcc/gcc-14.2.1_p20240831.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240831.ebuild
new file mode 100644
index 000000000000..261dc3f8707f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20240831.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="14.1.0"
+PATCH_VER="5"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.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=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+}
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 0221fea3739b..becb7a653deb 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -13,5 +13,6 @@ AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d6
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b
 EBUILD patch-2.7.6-r4.ebuild 1756 BLAKE2B 968678c5c7297e8de71d158c59aaa7d0762c725ece57cc82f38018cccad9761ed0b7c0e62236b754247f7321f1ff84dee4ae2c58bb9ac40f0cf6813834d635c7 SHA512 e0f22527303c0a8d222642eefb719a619a34a91e5f7f78028eabe21aec1d7fde297b53eee36238b6f4dc543a3a75c0012f67424c2ed85d48aa15e33f0b92fde8
-EBUILD patch-2.7.6-r5.ebuild 1959 BLAKE2B 4b248c097110763586ae4183806996d3dcf6e840a9267a9d7a813092d76322f4ed33efc0dab7ef21727cb1a6f7fda3b00d1c339597d6791b1201dfc96e16eeed SHA512 393a0efc64c07bcaead9f45dd8ba8aba28924a8ec936689c5954e645fefae5a2f56103a98738edd2d0cd78d8addba2f95f66c924c7332e4bb744866469e1274c
+EBUILD patch-2.7.6-r5.ebuild 2350 BLAKE2B 665e5f43704735ed6f2bfc215384a6b3dd537d2ff475f2321264c44d3765a686ee6d7770c4c7a16bde56992d76bf8b73bf48edf0f8c742cf74c951a6e0f0241a SHA512 7da3aa2c1ee3229dd587145118e158ce31d35edc265b44823b2981f513673e8409056906a5697b3a766c63c59c8fc911e322a93481302dd0799f6bf3c133fde3
+EBUILD patch-9999.ebuild 1619 BLAKE2B 829122397807c5e785820b522e839c72cc91e4179648ec3bcdfbf2ea4e2f6fc17462c5e43c72a587c7e0f79fef627849b345edb94bc4b53cd137f8992514f2f9 SHA512 b605779627aad0bff5b66dbb4ec2187168431e9b8aec0110cebb020d83aaed3b5e5ac62ca5bd8d963a8c61f2f352aa79bae1ac90312bd9fcedbe974e89ec98e7
 MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872
diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild
index e1dfc88fa933..0456b44dd8c6 100644
--- a/sys-devel/patch/patch-2.7.6-r5.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,19 +8,27 @@ inherit flag-o-matic verify-sig
 
 DESCRIPTION="Utility to apply diffs to files"
 HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
+
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
 RDEPEND="xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/ed )
-	verify-sig? ( sec-keys/openpgp-keys-patch )"
+BDEPEND="
+	test? ( sys-apps/ed )
+	verify-sig? ( sec-keys/openpgp-keys-patch )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-test-suite.patch
@@ -37,6 +45,19 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch
 )
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_configure() {
 	use static && append-ldflags -static
 
@@ -50,6 +71,10 @@ src_configure() {
 		econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	emake check gl_public_submodule_commit=
+}
+
 src_install() {
 	default
 
diff --git a/sys-devel/patch/patch-9999.ebuild b/sys-devel/patch/patch-9999.ebuild
new file mode 100644
index 000000000000..c8ff9cf8be70
--- /dev/null
+++ b/sys-devel/patch/patch-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Utility to apply diffs to files"
+HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="static test xattr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( sys-apps/ed )
+	verify-sig? ( sec-keys/openpgp-keys-patch )
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable xattr)
+		# rename to gpatch for better BSD compatibility
+		--program-prefix=g
+	)
+	# Do not let $ED mess up the search for `ed` 470210.
+	ac_cv_path_ED=$(type -P ed) \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check gl_public_submodule_commit=
+}
+
+src_install() {
+	default
+
+	# symlink to the standard name
+	dosym gpatch /usr/bin/patch
+	dosym gpatch.1 /usr/share/man/man1/patch.1
+}