gentoo auto-resync : 02:06:2024 - 00:07:23

2 files changed, 68 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 108576921c20..936098763275 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,6 +20,7 @@ DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212f
 DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d SHA512 14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f
 DIST gcc-13-20240503.tar.xz 84417232 BLAKE2B 4024852c3252667054e6086263b2a0e21dfa1e56a7adf4edb2fee4841dc2b41eb3f02dee7b15c5de3a1ac7c438929da4ca584cab07724086f6eb315a331c4a44 SHA512 32b74972ba94d1016e052eb7c7dc976b32d679e40aeafb406bbbc69d34ade3fe0f35d8941ef678eaf0bb33aea1aaba8fbce9122733b12920a470763a18aa6514
 DIST gcc-13-20240524.tar.xz 84442852 BLAKE2B 71b4d84b73c122a25db4eaacdd07d9f6920951d1daefae353c060d2360f1614c9e465df404e2ad30f5595d9d25a8ac87d5f481fb619a1fb8aae460d3c990252d SHA512 02e2dfb2a03e9e5d5973781e3556ddcc36861285c7c4dc8b82cde420ef34e322eb206f89cc81aad2c3e932d9e0e3565efbcc1f065971e997e730c75fbaad91a1
+DIST gcc-13-20240531.tar.xz 84452600 BLAKE2B bf0938328073073d9876cfccd54ee12e60e99a8cf159457825b104a70ef7d09537e40b4f1a2f09a3b5420c3c01facb9151d7e8f595d58d594b9d5cec2f06b552 SHA512 404b44f8073eadb80e781ee9ef5d3709f83ac7c43d6a703b8df81f30201c7c88b837019b961b0d71c6dcd7f83fb5b2c087d7e561748e50dca10e3116159dbda1
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
 DIST gcc-13.2.0-patches-15.tar.xz 47052 BLAKE2B f145341813d6baf9cbcc3e8421c7f427148503d2aeddd6a2eaac1ad3d470a818292392861542a7915d8b0f2f9b3255603f394b2e6833141658fc035bcd2b5366 SHA512 c89a3fccd944f03d25e076a967c3b220803ee9a6fbedec1daf2c20f629dd6162ce6be4f259522bd193169f0e8307daa9895b5d8581cf975ee086e5abfd675e34
@@ -55,6 +56,7 @@ EBUILD gcc-13.2.1_p20240210.ebuild 1718 BLAKE2B 3955dddeac163ab623486dc29bb6442d
 EBUILD gcc-13.2.1_p20240503.ebuild 1726 BLAKE2B 381a6cd5d60a1e4ac9016198f69d1910ece06c90a42fae257076bb996a602e7abe0a22ce3a54ee44fa556ee2b8f2aa01c54d113ba2be7694b2e67356dedfb213 SHA512 cc5789f2c17046e15ea1063102db13b58be0f63460e2ed284983c487c7e131b05daf1d26a59d8f337409552b8622e04db8d4a7735587d951235ec64438194316
 EBUILD gcc-13.3.0.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
 EBUILD gcc-13.3.1_p20240524.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a262466db69a4a3cde6fd51b0e9043dabcee3c0ec80ef027d5b8c7c8e57cf98152e8bddcf3a16766be5b70299cb6c53bf5c SHA512 8c5bf7c53185492760fb23fc5b656b59820bb9a1a4f607f76cb4d1392b096de2142b65ab035b5a5e40d48ffa7d641b563ee9a1a2f1343ff8eed6658f60f5f97d
+EBUILD gcc-13.3.1_p20240531.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a262466db69a4a3cde6fd51b0e9043dabcee3c0ec80ef027d5b8c7c8e57cf98152e8bddcf3a16766be5b70299cb6c53bf5c SHA512 8c5bf7c53185492760fb23fc5b656b59820bb9a1a4f607f76cb4d1392b096de2142b65ab035b5a5e40d48ffa7d641b563ee9a1a2f1343ff8eed6658f60f5f97d
 EBUILD gcc-13.4.9999.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
 EBUILD gcc-14.1.1_p20240518.ebuild 1619 BLAKE2B 45cf6627b223638287177489e67c70cbcb09bedacefcadbe0165c05270ee2d56459fe9bc1d209e84ebb9470a038ec75c7e57881bd7e202ae0aae66ef94bc3b98 SHA512 2ab7c3c0d46b690e60ebaa3582b71cc3b0cd7930767888699825674b82e680dddcb4ff40552ad77c9c1d576f21ad98e6255b46cf6e7dc21f10252f8a73db9308
 EBUILD gcc-14.1.1_p20240525.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240531.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240531.ebuild
new file mode 100644
index 000000000000..7f5e607cfbc5
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.3.1_p20240531.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"
+MUSL_GCC_VER="13.2.0"
+PATCH_VER="16"
+MUSL_VER="2"
+PYTHON_COMPAT=( python3_{10..12} )
+
+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
+}