gentoo auto-resync : 14:05:2023 - 04:00:22

2 files changed, 64 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 40638fc5f495..66df39714289 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -18,6 +18,7 @@ DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b7
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-12.3.0.tar.xz 85491976 BLAKE2B a239749089e284887435b9fabc360a36764be1095f4c78eeac6f056f91dd23c49dab2ebec5da32a81bcc08fe8277dd3c714ad114ad725d24317faac03354d595 SHA512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204
 DIST gcc-13-20230506.tar.xz 83939392 BLAKE2B 439a139f6ef4b4c3afb5d3e4db69f2a4aa24a410c7b9c6689e58b2eec6383388ebbbd8a6f7be1d5cba2aac770ec7758a8b4b6bae80c63475a3b72372d1bef283 SHA512 5255500c92a72fe066b110efb20c73da217ddaf38d726b1a8f051dd27b6a613f3b4379762cdf4310823113e9bc75a31d6d72c060b20216a2a6bcd34800a2e1e1
+DIST gcc-13-20230513.tar.xz 83957000 BLAKE2B c1d17c383b5735744952ef61fa34f0129b304cae78dbeb0e780a81ec4dbfbbc438f8546770da973155ec5f9250d36be587a8491c88d4424b1123f47ba24d52eb SHA512 a82e38d273a668e4a8ad33282cb74661d125babcc6165eb0ada5da471154b2ed2894bf1fa462f0345f9d817e733b155c09a971885f3b7c04398ebcdd3b5551f5
 DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33
 DIST gcc-13.2.0-musl-patches-1.tar.xz 3572 BLAKE2B a5fd1dd6f94aa9f2b35815e193bdecb9c343874e5181761524abf9db6e796bad6b57eb7de9b7aa41b61c370df526f4fc2b56766eb4b2d430b10785e3c287d544 SHA512 d55f0097053ea38ec1e2880059407bf726c5f6282c2abe659646e3af7ac0844c80ffb06e9006f6320e8a19752d90a2b960403239f17f88bdb5ab43fb9d80c1d2
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
@@ -44,6 +45,7 @@ EBUILD gcc-12.3.1_p20230512.ebuild 1584 BLAKE2B f59f298e274530f8bd4f2870c1429f9a
 EBUILD gcc-12.4.9999.ebuild 1593 BLAKE2B 8246fe30de8cf3d515b1c5c23eea470de257aecc452fcce47e72497b310c62893c39275db02245a12a258b06c4ddd695a8346c9b539efca2a8e1d64aab0a8955 SHA512 a0fa5d4f5e6d1545e13d33b6fa45709f7dc5fccf026d060eef26752d7000c21b913276609abb6b174b2d04e08de3c61f8c4b126acbb196c767a8886ab7999ebb
 EBUILD gcc-13.1.0-r1.ebuild 1664 BLAKE2B b6fd223eeee8e6b0b02a5d5eb33437b1ba036bdf09a13aaab95318682f83d8dd1a184eb6afd8bef2c34013bfd8d0f38a108f3db0d6fbfd565f29d363cba98d3f SHA512 7e8eb3791678e456bf2c7717a4b8c95322efcde8dc3030f035cb9577fbc416a2c8b567e588036f94bffa2dd83bd00ee98a797d50d65388a3fc022819e4ab2c2e
 EBUILD gcc-13.1.1_p20230506.ebuild 1667 BLAKE2B f1b5e024192ec9018b8de8f9db0ee151264b356551f8c8af5af9f7772efdb4fe07206ea4a854f6476d4950cba25087ced439d724d6a515839a0ac7c5756da935 SHA512 3fbc45c4b23d3c2f93b3edcd329f8627359a7305f0640a089aeb995845b69db058da97ec995f1f0a86438a28d6922d513c50a3fb81198daa6834eed4a99c055b
+EBUILD gcc-13.1.1_p20230513.ebuild 1667 BLAKE2B f1b5e024192ec9018b8de8f9db0ee151264b356551f8c8af5af9f7772efdb4fe07206ea4a854f6476d4950cba25087ced439d724d6a515839a0ac7c5756da935 SHA512 3fbc45c4b23d3c2f93b3edcd329f8627359a7305f0640a089aeb995845b69db058da97ec995f1f0a86438a28d6922d513c50a3fb81198daa6834eed4a99c055b
 EBUILD gcc-13.2.9999.ebuild 1593 BLAKE2B 6ada03c3a63cbdb90a06954f02809b1f7aec31130c010981554ef8df4db41d79d856ee514694b9f900983e7649cc94929e3050764ff6fef5a8227701710d423a SHA512 89b624dc6f8a1187f3d36f9988409c27e1e2133889a1135be0ecaa3aaa7c381f780cc20aa8095be9bc31c4e16b96128ba50dc17431305bf3f334025956a95746
 EBUILD gcc-14.0.0.9999.ebuild 1591 BLAKE2B 8a463d1b3d812a22a29a4aec27504bc138a69939b328f6fecf4eecaa90aa51acdb2e53fdf5ca5d69c5159019c354ad9ecaff218181f06fbbd9a0da43fc70c962 SHA512 67e09c08daf026d9c61f8feeafcd595c37103c04879641f6d79ef7ceeb0d44d84dd81bc340e77d031c8675a4ac858ea5a555fe0dc76fcce57991361b2d09c1b5
 EBUILD gcc-14.0.0_pre20230507.ebuild 1622 BLAKE2B 459d438085fc5382680372ccbe7223f56906207667619a7788c5ff1c2b573c363481c9857f64aa17f5a67ddf35d5a4c79b559dad70b8bf2593710b610c19335a SHA512 fe6b9cf8dcee281c71ef30a28f5da38922f2be6671573545f3a7b3b1db9220aa6236f3441fe3ad2d31b389ef752dbe68f1b75f45532565fd20e0bd01ebcdf77e
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild b/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild
new file mode 100644
index 000000000000..10a0c8381b19
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="2"
+PATCH_GCC_VER="13.2.0"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+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
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	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
+}