gentoo auto-resync : 24:12:2023 - 07:41:16

2 files changed, 67 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 08dce689f35b..cc0c05248428 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -32,6 +32,7 @@ DIST gcc-13-20231125.tar.xz 84338152 BLAKE2B 4951fd200fe5abd9ed2f6a9ece4637c3a05
 DIST gcc-13-20231202.tar.xz 84334144 BLAKE2B be5db65cfee37cfd0201ec1720722c113d1b3cb1b58cabd7a9b5f6d585c937ba3a8d60327b5593c576f8fe50d95b0fe7a44a0eafad2e68a03f3ac31a5b92780b SHA512 5a7ab2979bec60138c78e30c05a02143bb10abfcb7596743b00f741225b7fe53b2fc9a6343365965b927311b4c9049ab1e7cbe9492d92513dd34c84b38341d92
 DIST gcc-13-20231209.tar.xz 84386056 BLAKE2B 013f5bf0a22a3f9e99e28595de08b0742aa0630e64371f6ff30f1da184a45e1a1875401ca4e6cbfe09dfbe455c0beff54a0f80f1008a16ec8c67979f640a66f2 SHA512 1bba056f9912d125f0c97b3c9cf4b6e4ce714a131c8d8d412486dc004ea969a1d45ae82c9c717a48949d12e765d3a06cb55d826e081c87e1b1fd12b7863f9242
 DIST gcc-13-20231216.tar.xz 84341616 BLAKE2B 416ee94995b0812ac155ccfb9a5cad39529e0b437341eae65fdc75ba64bcdb453742e213f676a80d91615f1840e2e52488e4a8311588a2ed16fde7c176c5dd06 SHA512 66a72380db151355ede533541b2e77406925f2a0f941772018bf93f8a4c2b8eaeacc3f600985897f7d9868234bc250a7af82d27634ba170ab6dfb2a62c68c0ed
+DIST gcc-13-20231223.tar.xz 84352544 BLAKE2B 1ec97e3b60bbf49d2106e8158e1ff66eb2e2da7d3501e3046ce12a2728e070ea0d44eff42cb5f1765ade284515b2e3c9a24ef036482b6456d5623fff3ce68164 SHA512 f3b066b27003a7c3a83f71d1670f9d662e397388e299ec2e33d674bb1d15b2443fd1608d10052b897f5159584aa3116603da33ace7c906d16e50371af5f8a745
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-10.tar.xz 45860 BLAKE2B 3c4f8179fc27c31c117bf9260cebbab0805e0977cb41084f2df5c6664121ae67f83deb882572b0bce8d5f20c0ec927eeac43e60d69ce8d4d5a263c1dddedecaf SHA512 4088cc80278826043bc6a9819dfcfa09a251e256eca9a2654f1a83b9b54107ca08fbea0e9ab61593cb0b43fc42a3d87acbe095dc8f806c7010a3ac33148d5c9b
 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6 SHA512 a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344
@@ -74,6 +75,7 @@ EBUILD gcc-13.2.1_p20231125.ebuild 1681 BLAKE2B 3a0c49b010e490ffb64a63da3630c407
 EBUILD gcc-13.2.1_p20231202.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231209.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231216.ebuild 1680 BLAKE2B dd776c332de13307fefdd9ce3115e30e265d424841d014bb9b1ac85cea2f4d3ed7dc91905a93a9d257114a55010e2b325b52c1b422a97c7e24b13c9e3d72805b SHA512 6c581f635e072fc097844fba70c441ab8f57d801cc0d2d70b533b014410f0f573418ad62ec2ba4c70a82b805e8a316a498e68cabe6929898351be7236f37f18c
+EBUILD gcc-13.2.1_p20231223.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01fc75222c1de50997555b70ebaf2a374dd9f61ffc3eafc1befe23ebedb36123e4f2366cb623b69f1ed566a1a3b1 SHA512 2138f692eca45b998e5675fde63a5b36dbc1dbdec36d2aecf5695c12c51caeaa578a443bc9e795de9e711a55bef79dbf5ce9751a151002bf1625df90b1bb9ca4
 EBUILD gcc-14.0.0.9999.ebuild 1568 BLAKE2B 02ff0ed9ee64898714a411d4d6dce9ab4ed30ec1f8dce58036da4cfdd033281868c82b1a9e6da669898e405194f84be3db34cbf7a8b0144d2049558f30370b90 SHA512 5aa6f2841a026a8b021f3fd0a6ff47f11f1a7039454cb95a8af148f247792c90d08d254b16c1369e0aabf83da53add611594632a951fa075c06daee837eb27c9
 EBUILD gcc-14.0.0_pre20231119.ebuild 1595 BLAKE2B 93754d4e2dcae64b6a47640e176af4eddfcb21ff0f18ec912a53a7631d6f60b850002a2e1b39eb1f090a589736a5ec133045793dfac68d16a6b9cabbee08ac37 SHA512 33f3a974d815655dafa35d83e537e2edc62efd402c2211cf621416fae763a52bc4503975e3448e25afc89490323690fc23b441d5e0c8d8fc0108b4cd11f00139
diff --git a/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild b/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild
new file mode 100644
index 000000000000..945d3a229424
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 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="11"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+
+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=">=${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
+}