gentoo auto-resync : 20:08:2023 - 09:41:00

2 files changed, 67 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b0afb0e83e13..852a21f2321f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -30,6 +30,7 @@ DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb
 DIST gcc-13-20230729.tar.xz 84264252 BLAKE2B 85e0b8af941c6d57317bf68503ea278ecd9e0927e994e73b65b2a674610daa83d3081c9aa87326034b22e694e841d714734187a69ffc80d63d1f5e48d9514772 SHA512 46a42d79de118a16dc195605fd461034e9b41856fb11fee3bcce962517e713094935704aa88e1ca05f896176bee9eecfef835ee8858ea584421b924390fe3812
 DIST gcc-13-20230805.tar.xz 84271272 BLAKE2B a8898131c3d597417cd349a91d9015d27a7dcbd9bcdbf75c96da45b07fd48b0a2bb240e5e90cb138ebbe7ac9df7c43fc7ca768e88fc1ffe388ab38c4c07cd219 SHA512 386cf5ae6948f7dff45d82910bb52418e0e040a8d2802a658c05cc0bb0be16c880878a18af4fba7a5025132b77657c50b20e84e3ea77c1520a7a135013879750
 DIST gcc-13-20230812.tar.xz 84291228 BLAKE2B 5210e6d2dfc3250efb924ddd8ece283a568669878adc278bb38b7859085109a09881b610a85ecdaac144e5f600e1cf9ebcbbc9e8cb0ae2acb1805e89b0b62868 SHA512 31ff4b3f7b30c1313918c3d492c3a83e321159864b85ac266fa027baf90e41e5cb88208cffa94a482bb898000d6f199556e34e93961a7b6f92566d62cc818613
+DIST gcc-13-20230819.tar.xz 84298080 BLAKE2B 6488fef3c12f5f521c956294092117ab25bc1c0d5ba1691e3d57300aefa28219ebff9e8ed107f41a605253575c455884d3c7b637fbbfb4285afe488530c0553b SHA512 324b914a772a505b79906cff013c1c7a1bfa207ba05f080b4531a5ce5ba0d0c38747021b4f8fd5a0aac3ea225d972f0a4471897fbab82c372506210769350152
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
 DIST gcc-13.2.0-patches-4.tar.xz 35284 BLAKE2B 230932b5df961518dc0c1aea219e65bd49a64bfcbe0621f90012d8fa18c099fbaa9ce865fb7b95e403e9b227d4cc86bf701668837519a3962a76769f49cd1356 SHA512 5464a6de67ed16a5b3200d513069e8ea10d57d0c78eb84523d30f7abfcaa2611c5462e83f9bbdb079e42b4f702e5f2ecd1db0f370fdf0fe6c0216a08cf2801d7
@@ -70,6 +71,7 @@ EBUILD gcc-13.2.0.ebuild 1679 BLAKE2B dd35823fb6e934b093eccff7d8e4554ee15503bc52
 EBUILD gcc-13.2.1_p20230729.ebuild 1680 BLAKE2B a5e65a610fec237c84f895495ffc3d92d014ea0fa766184fe43cb9f631dc02736621b504a933b5de9a5b77bfaa460b28213760115d65a95e4db822c96a3b021f SHA512 c3aaf245ef73377e56b48239b63264beaded09939cac00ce35bc71a7e14a6ce8c0f4c883c85f397ee7e7d2f46845f44542ffcfd4bb2ee3588597e92474199bc2
 EBUILD gcc-13.2.1_p20230805.ebuild 1680 BLAKE2B 704da8b692fac530c860995c1e78fbd1ef8ff90daf23a48660b88795bdc2f34d4f2f1b53c7eadaf8fc4848a5b51d8fba2fb861301c3684c4f37f20fc00f31a45 SHA512 27f113456854feea8f4aaaef707aa966afabc7d208dd5aa8c257fbd95b6ac8b6bb9618ba4079fceee5b7b0de9d032f30bbc40444e0ffbeffd350868988146acd
 EBUILD gcc-13.2.1_p20230812.ebuild 1680 BLAKE2B aee3a83f8766cfa29d43bcfe232d517ffb121c1fbffc10422e5a33f7c815176dea24bd0e0d66c173f714e787862d5839797ce1e7dcb07a9bfa9323cc826a2eef SHA512 f6e2a1f67a9ecb19a9f4c6433be3b6f603d8c09b31a5cb3112b997ac1d0ff3cf90cc59cbf59aad028dd343e2d52dce8e9ad25d7ceea13ca0c736da46965a9870
+EBUILD gcc-13.2.1_p20230819.ebuild 1680 BLAKE2B aee3a83f8766cfa29d43bcfe232d517ffb121c1fbffc10422e5a33f7c815176dea24bd0e0d66c173f714e787862d5839797ce1e7dcb07a9bfa9323cc826a2eef SHA512 f6e2a1f67a9ecb19a9f4c6433be3b6f603d8c09b31a5cb3112b997ac1d0ff3cf90cc59cbf59aad028dd343e2d52dce8e9ad25d7ceea13ca0c736da46965a9870
 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_pre20230723.ebuild 1595 BLAKE2B 6986a9323f7bbc6c814b68b40333c6279ba7f1b1733695b12568e59390b991441b03523b015fdf67e8b0249fdf874e36a46993d2357d9b24b3a97b79ca4bf8fd SHA512 c2cc081c84cd0846da49b81e7835e8b35365d51c4a014edb765a410e4a7b528928f32fedbca2e40aa0d2da80ccebaadada67c1b746a70b6e7910d71503cc6097
diff --git a/sys-devel/gcc/gcc-13.2.1_p20230819.ebuild b/sys-devel/gcc/gcc-13.2.1_p20230819.ebuild
new file mode 100644
index 000000000000..fb3f9765eb8c
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20230819.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="7"
+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
+}