gentoo auto-resync : 07:05:2023 - 11:36:18

5 files changed, 65 insertions, 2 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 03c4f8695978..20cb05b11f22 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e159a9917126..b6e38285622e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -16,6 +16,7 @@ DIST gcc-12.3-RC-20230505.tar.xz 85584972 BLAKE2B edd2da8ce615e843ebd47b09b1868b
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-13-20230429.tar.xz 83944828 BLAKE2B e939826a8ed126ff5543da048ba0071cca8e2b2a77335f6ee506debd0868269a3aa299ab695f1419eb84b472d406736b293ac2495901f82765e445102df3e03b SHA512 48095ff181f7389bda249dcd67c3c0369dd8fbe4741a8ab00833c0f5d569be165db28c369f65960650812a6011dda21692cca806f4c3261773b28d702e9f0c53
+DIST gcc-13-20230506.tar.xz 83939392 BLAKE2B 439a139f6ef4b4c3afb5d3e4db69f2a4aa24a410c7b9c6689e58b2eec6383388ebbbd8a6f7be1d5cba2aac770ec7758a8b4b6bae80c63475a3b72372d1bef283 SHA512 5255500c92a72fe066b110efb20c73da217ddaf38d726b1a8f051dd27b6a613f3b4379762cdf4310823113e9bc75a31d6d72c060b20216a2a6bcd34800a2e1e1
 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-patches-1.tar.xz 15792 BLAKE2B 2ffa9ac013c0f9a91eb93e87e3bc6c378d02cca32ad3f8a84d1249e257eb02b206ec10fa425738a4bae2ffb7db8506afcee2a8dd855357e4b48636608aa24e50 SHA512 917ea178f3696724f9ec08aebb6976f03c5edf8ee21bb4bad7e2d820507452f6dace6e847c4f342a52870642550f34da0346ee635a60ba0c1bff667e0e31d195
@@ -40,6 +41,7 @@ EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 8246fe30de8cf3d515b1c5c23eea470de257aec
 EBUILD gcc-13.1.0-r1.ebuild 1664 BLAKE2B b6fd223eeee8e6b0b02a5d5eb33437b1ba036bdf09a13aaab95318682f83d8dd1a184eb6afd8bef2c34013bfd8d0f38a108f3db0d6fbfd565f29d363cba98d3f SHA512 7e8eb3791678e456bf2c7717a4b8c95322efcde8dc3030f035cb9577fbc416a2c8b567e588036f94bffa2dd83bd00ee98a797d50d65388a3fc022819e4ab2c2e
 EBUILD gcc-13.1.1_p20230429-r1.ebuild 1725 BLAKE2B 622cdbd78b7911e7d65a55ab2c307f8112a95d822b05da74f090468d37dd1f8b68de52622a002f7692c9c4e756a0ba3e8ee42c6c5e60744404c18436526d07b6 SHA512 d0c5f9a9280ad891faa7a81833608ab8b5b3de507d2e4386c760496757b10d38db1acb36edad45f6bf0feb472a6503d7fbbbe82e9620e9ce6d7a6e35ce0ab78f
 EBUILD gcc-13.1.1_p20230429.ebuild 1667 BLAKE2B 203742b6419ff78eb94d042fe075de7fda493727cca3d7d7e6dacef9164c933a38499679a1f475be9280253a69d8b6956e1bea6b49d2759551467d1e3edcf912 SHA512 d311743bde448733bf1eebf8b155f0910eb2498b495b263d42dc40938acfb4663bee6db0d4e093679ef96fb0de9671a5398ab7858ec1ab08d4005f02a25c2995
+EBUILD gcc-13.1.1_p20230506.ebuild 1667 BLAKE2B 203742b6419ff78eb94d042fe075de7fda493727cca3d7d7e6dacef9164c933a38499679a1f475be9280253a69d8b6956e1bea6b49d2759551467d1e3edcf912 SHA512 d311743bde448733bf1eebf8b155f0910eb2498b495b263d42dc40938acfb4663bee6db0d4e093679ef96fb0de9671a5398ab7858ec1ab08d4005f02a25c2995
 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_pre20230423.ebuild 1622 BLAKE2B 459d438085fc5382680372ccbe7223f56906207667619a7788c5ff1c2b573c363481c9857f64aa17f5a67ddf35d5a4c79b559dad70b8bf2593710b610c19335a SHA512 fe6b9cf8dcee281c71ef30a28f5da38922f2be6671573545f3a7b3b1db9220aa6236f3441fe3ad2d31b389ef752dbe68f1b75f45532565fd20e0bd01ebcdf77e
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230506.ebuild b/sys-devel/gcc/gcc-13.1.1_p20230506.ebuild
new file mode 100644
index 000000000000..dfbf72276193
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.1.1_p20230506.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="1"
+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
+}
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 54dfbecad42f..fd9757dfa73d 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -1,5 +1,5 @@
 DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c
 DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7
 EBUILD slibtool-0.5.34.ebuild 1079 BLAKE2B 119665787b3ab0ccca1293aabc4e16dcf734c2c762e01a441949f3e4c29f942d91347e2f1128d10c16e7e14a5da3ae60455d8c0191cf85ffb649b41a77f4813e SHA512 f8c949361ca2a934c575e418d49a26210ba44730c48cfd2c6cdc784ea410bfd018e40c08e94840af10a9ebdd8b028f9f743b67dbfeaba116bad380fe27fe6b59
-EBUILD slibtool-9999.ebuild 1047 BLAKE2B 8384c38f5f816834f443ede523d55d8dfe9d580fd771bb0c115aa37d46613843c4f0085500b44aba32fef8fa121eea0b79403ec6a25657955ba031ef7146cfac SHA512 5055c1d6f16ac9637366c1ba9bdfb527645c10bf9ffc1ce2b4797d4418ca804a179f0436cab7dec495864775e7b90dcb62b5c3ed3fa8c48cc3596b2dbfaba154
+EBUILD slibtool-9999.ebuild 1015 BLAKE2B 206a1b02d9b18b8fb5a84c183e22648c0e018b80477d04c38cb5158635ea46b9bb85f80abbfc83af17b84c428cf4ab1224ff951f15d6addd1076a4a1796f3389 SHA512 906f76a9e0fb20ef0650d3346543973450bc7ef03b5ae997f5c9ee56e3e03d87458daa14110d0c09abc154871ef4da664a6cb2e6416411cf657b52b7eb5dcfe8
 MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5
diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild
index 5295be737954..74b39d4339b5 100644
--- a/sys-devel/slibtool/slibtool-9999.ebuild
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -33,6 +33,5 @@ src_configure() {
 		--host=${CHOST} \
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shell="${EPREFIX}"/bin/sh \
 			|| die
 }