gentoo auto-resync : 21:04:2024 - 12:05:28

2 files changed, 68 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c3868790606f..853bc4c8fc7f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f
 DIST gcc-13-20240330.tar.xz 84407332 BLAKE2B 28b40915bf8e9ecf71b50d06fcdf69c01e87d3635f0c6b6159e003a0876453ada062cc538204604885e1350d226417fe9d7cbdb5e39146f9fde0d524ad34ff07 SHA512 4c4c4be522feb9ebe1bc868db59f0828de1154f80afad6c32bc2c7cf45df3797cb5e6dce2b35a297194ea87f81e34439f4d87bd88cabf0a29ce686e1b29e7a08
 DIST gcc-13-20240406.tar.xz 84392728 BLAKE2B 42a560b01677350c480bde2a7436a8be4d2259100dd6f2f9e7c5555adb3d13ee1f51bfae058ceb0cc2ca4d527b302b5250f26b3d6b26fa9c7a2f5715aa003a3f SHA512 e5ec524df7e9498a23ccfa42e28c5ce284fecdbb4771980328257d8251a11740c4cd3970d6bbe13052907b257d8e89b176d183c895168cf524dda12582d05d86
 DIST gcc-13-20240413.tar.xz 84405692 BLAKE2B 4df749357ed33afdb0255b4dc02ae568ce12e461c07a535f3736c2dcd9f779391846097aeb99ed70f5f45dbc029244a0c994b84f1de1086cce3da23bba719984 SHA512 934857721e1a92ea709e1ff6f64dbb8a47df4c614935ec298ded0a19bb92342e50bb8ab7eccd6e3ab46ca00e86ed34b499d4b06379a689bf48bf4201f3956006
+DIST gcc-13-20240420.tar.xz 84407856 BLAKE2B 188b92454735223a4da7af2b5b57bb52c6362778550aa6ddbc445d3a2e0700494db2f743da59961ceccb756791f01c23f76c83224daeaccfb561cd1d2e6ece7c SHA512 6be1fbb1cddebbccf38da4424af56e173d0c4a53e63ed3a9d86398f23053747a231287ce7bdeb5666ceeb4f3385dee228cc05fba19beaf4d7b2c9cbe1f14a489
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-12.tar.xz 47404 BLAKE2B ed018bcd7429d1c7aace746cbfc4e59dae409fc0a35231320c1b44c96fff0d912eba5c72109c2deb883f5368159df02148b2d4373396b34da882164c61fe4387 SHA512 b7872a03870bce7b633e4af4329b24fe8f3d50d6d9173f63549f606ce062787748af7f79e7ec4afeb768968d6e8462a849bd1b94316ea6bb284551f99e811617
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
@@ -63,6 +64,7 @@ EBUILD gcc-13.2.1_p20240210.ebuild 1719 BLAKE2B d9bb1a8b735e2c5fa305aa1f5e4ce458
 EBUILD gcc-13.2.1_p20240330.ebuild 1727 BLAKE2B 3450595bbfe36e9c1911ed35d5956035692328e801ec7ae86fadfcd61fa55a07e89685d8d65738d62e80ea0bba09ca4a034801af7abe34ae983ed4b963f3f295 SHA512 4497f79d76027fa8110af1ed7fd4f59e00e673416f86a7db5657287a8d1b7cf21df071c690d1fb03756e79f0219e55c3fd5eed6806aca5aec2f204ad20ec0125
 EBUILD gcc-13.2.1_p20240406.ebuild 1727 BLAKE2B 1c5dbab007729b544a2f8daec33cb6f6912f2c0a49d43ffdf15dec9a3cfbd12e46a4ce0b6f5a193f4c47a21cb7d4ecc1a5bee1b4a00c91776786d99acdbd7a02 SHA512 edf0e5d3fea819fd4ffeaa5264acc3bcbf39f10d23d1c8c4b6af1189de7b0e724b874a7579517cb421345825ad01d2f4990c671380d8d4cca4e71611f788ec58
 EBUILD gcc-13.2.1_p20240413.ebuild 1727 BLAKE2B 1c5dbab007729b544a2f8daec33cb6f6912f2c0a49d43ffdf15dec9a3cfbd12e46a4ce0b6f5a193f4c47a21cb7d4ecc1a5bee1b4a00c91776786d99acdbd7a02 SHA512 edf0e5d3fea819fd4ffeaa5264acc3bcbf39f10d23d1c8c4b6af1189de7b0e724b874a7579517cb421345825ad01d2f4990c671380d8d4cca4e71611f788ec58
+EBUILD gcc-13.2.1_p20240420.ebuild 1727 BLAKE2B 1c5dbab007729b544a2f8daec33cb6f6912f2c0a49d43ffdf15dec9a3cfbd12e46a4ce0b6f5a193f4c47a21cb7d4ecc1a5bee1b4a00c91776786d99acdbd7a02 SHA512 edf0e5d3fea819fd4ffeaa5264acc3bcbf39f10d23d1c8c4b6af1189de7b0e724b874a7579517cb421345825ad01d2f4990c671380d8d4cca4e71611f788ec58
 EBUILD gcc-13.3.9999.ebuild 1635 BLAKE2B dd8eb497c0352febec3886808c4837e880b858ea20e68135ea72432919a9a7ff4a7e130912c06aad1e6db31f30db3e697f7978df1644f181d824be0ddbfe096c SHA512 211e181b1c449adefeedd28f6e304eac634797e897c39418da28d0ab20f5f33cfae7c10710f007fa0690cd049abd6e4a5adbd5dd02aaa6f532cbb2a593692fc0
 EBUILD gcc-14.0.1_pre20240317.ebuild 1701 BLAKE2B b3884316f5d5dfb8f5aeec04952f12b930e69c34acc98a758304ae3d8b10a2cf033dd92fd1ff71924d90095bdaca76b3f076af24d751344da73296d78e6fb2c3 SHA512 f822283f4299c844fbb4ea4e3cbb631562435b4ce37f41a5700a0477970cda8bb4c399a0adcd8fc2b2dd58b82f442b1f86727061849ed57d2debbda1c60e3b76
 EBUILD gcc-14.0.1_pre20240324-r1.ebuild 1743 BLAKE2B 2f95379995ab1f1d5984797ac29964b31d4c7c38b4c37f682eab29019df08092ab4ae272f939ad58c4e04e2d272c5206ca4270549c75dd5899d739c064bf9e81 SHA512 fec375ced34cf10dac1e244c117000ba89e81eddce2d7fc1805f8c9626d8e4e67c3d589f77fbaa335fa77f7d2ead6b7bba110378d7a883588842442315d1b410
diff --git a/sys-devel/gcc/gcc-13.2.1_p20240420.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240420.ebuild
new file mode 100644
index 000000000000..2a22fc220b4c
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20240420.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"
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="15"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 ~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 "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}