gentoo auto-resync : 14:01:2024 - 01:14:49

9 files changed, 77 insertions, 10 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6f133ce8759d..b5b62eaeece9 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crosstool-ng/Manifest b/sys-devel/crosstool-ng/Manifest
index a906fbdd6cfd..3b548ccd9212 100644
--- a/sys-devel/crosstool-ng/Manifest
+++ b/sys-devel/crosstool-ng/Manifest
@@ -1,8 +1,8 @@
 DIST crosstool-ng-1.24.0.tar.xz 1622432 BLAKE2B e0f3f26083dd10a35ac79fc78debe98db7914f5d7fd710ed6b4c788a7a0d56e22d22966f186e8315ae99a6141d1d5b80686e86ad8b0549514a07dfda5913a348 SHA512 89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4
 DIST crosstool-ng-1.25.0.tar.xz 1075688 BLAKE2B 4484b1a0b9ee65a927c1fc76e86087e48c4f27397c8ebc5a94cc1bbf78a66f4ab94fb54239943a9c710350bd65056e9f63c4138ff3c8f750a35b2a1bfaca6080 SHA512 e25b6fb577ce439592a889fe73bbde4109309e7fe154e7133fefaeb5522c97e3f96958941aa1bc86448fcecb6b4021ff793c595048f5ef8e5ecc75e9a48c0c45
 DIST crosstool-ng-1.26.0.tar.xz 1144720 BLAKE2B 68c38dca58a239bd2a7a4e0f0adfa0069d97aba632c8a8a70594a67bf1049f0576db2d20b8a6ac90b170c1a3d8245f952a949e4fd006abe1d5e54effbb8e100b SHA512 7834184ae5792fd347455f9f48fee826248dcb82d271954ed4304b1a18f63995ff8a2c3b817564dcf147ac7e16e02d779195b26d97eb57db27f1118a1837002a
-EBUILD crosstool-ng-1.24.0-r3.ebuild 1698 BLAKE2B 1e57aca12e5c67ba3b564156fcc8e047c227b8a502215f393d89adc5cec52fac8ab0b928d6c77a3b590b1919f27e430cae73db7c749c4fbf7a28324f15149485 SHA512 5a72b0d50a9dfe51f4607311f97a49f2b5bc3c7510ce858ec107d36406c7280c589d2b3942888a9cd0ff878535602a11ebcd5e0d62f551e8239830e6576f8cff
-EBUILD crosstool-ng-1.25.0-r1.ebuild 1698 BLAKE2B 1e57aca12e5c67ba3b564156fcc8e047c227b8a502215f393d89adc5cec52fac8ab0b928d6c77a3b590b1919f27e430cae73db7c749c4fbf7a28324f15149485 SHA512 5a72b0d50a9dfe51f4607311f97a49f2b5bc3c7510ce858ec107d36406c7280c589d2b3942888a9cd0ff878535602a11ebcd5e0d62f551e8239830e6576f8cff
-EBUILD crosstool-ng-1.26.0.ebuild 1698 BLAKE2B 1e57aca12e5c67ba3b564156fcc8e047c227b8a502215f393d89adc5cec52fac8ab0b928d6c77a3b590b1919f27e430cae73db7c749c4fbf7a28324f15149485 SHA512 5a72b0d50a9dfe51f4607311f97a49f2b5bc3c7510ce858ec107d36406c7280c589d2b3942888a9cd0ff878535602a11ebcd5e0d62f551e8239830e6576f8cff
-EBUILD crosstool-ng-9999.ebuild 1698 BLAKE2B 1e57aca12e5c67ba3b564156fcc8e047c227b8a502215f393d89adc5cec52fac8ab0b928d6c77a3b590b1919f27e430cae73db7c749c4fbf7a28324f15149485 SHA512 5a72b0d50a9dfe51f4607311f97a49f2b5bc3c7510ce858ec107d36406c7280c589d2b3942888a9cd0ff878535602a11ebcd5e0d62f551e8239830e6576f8cff
-MISC metadata.xml 972 BLAKE2B 405e816981743aab4fa47f2045d982b40ab9c80ba1a8bf4385da7e9e9def4f6d31e2ecdb43350abcd63b62365ae7d4a244859a5b0da7d691b20a9b39e34dfc01 SHA512 57435c01f67e4e0e54fbf4a95ee1964557d40fffa4e385da509b3884e0c509d95b30aaa384d22c1faa8035f7962541bc014fc163d82e266571c8991978aa2799
+EBUILD crosstool-ng-1.24.0-r3.ebuild 1699 BLAKE2B 6389f927f91df9492ef8da4c1fe8eefb8f4a1168059c6af5350a9b5846a7f5150f66e2656bcf9964619ea06c59676fa6ea3a12a4f753fa4db70c5f6830782c25 SHA512 fa7169a3bf950a388893051f95aec734c5b6c29334a6b471303895adc5ca5f4aa6ac0e87cae8ce50dfe0fcac88b7d182cc0cd0d4182111d94bcdde947ab2c5e2
+EBUILD crosstool-ng-1.25.0-r1.ebuild 1699 BLAKE2B 6389f927f91df9492ef8da4c1fe8eefb8f4a1168059c6af5350a9b5846a7f5150f66e2656bcf9964619ea06c59676fa6ea3a12a4f753fa4db70c5f6830782c25 SHA512 fa7169a3bf950a388893051f95aec734c5b6c29334a6b471303895adc5ca5f4aa6ac0e87cae8ce50dfe0fcac88b7d182cc0cd0d4182111d94bcdde947ab2c5e2
+EBUILD crosstool-ng-1.26.0.ebuild 1699 BLAKE2B 6389f927f91df9492ef8da4c1fe8eefb8f4a1168059c6af5350a9b5846a7f5150f66e2656bcf9964619ea06c59676fa6ea3a12a4f753fa4db70c5f6830782c25 SHA512 fa7169a3bf950a388893051f95aec734c5b6c29334a6b471303895adc5ca5f4aa6ac0e87cae8ce50dfe0fcac88b7d182cc0cd0d4182111d94bcdde947ab2c5e2
+EBUILD crosstool-ng-9999.ebuild 1699 BLAKE2B 6389f927f91df9492ef8da4c1fe8eefb8f4a1168059c6af5350a9b5846a7f5150f66e2656bcf9964619ea06c59676fa6ea3a12a4f753fa4db70c5f6830782c25 SHA512 fa7169a3bf950a388893051f95aec734c5b6c29334a6b471303895adc5ca5f4aa6ac0e87cae8ce50dfe0fcac88b7d182cc0cd0d4182111d94bcdde947ab2c5e2
+MISC metadata.xml 973 BLAKE2B e910f49277500ae3bebdd7307c8e6bce9cf8b16e968790c308c08678da2742ce04aae68b6fef00af59c4f56ecfbf6a1ed1a7a255d7c78925af30e0ecd22195a1 SHA512 012a54cb5bac5775dd0f7ea8980a8422a108d3447ec34386ca5c1d2fd5bb996e22e2a683a66b401822ccf59aee864580066c97d3d6b85c797373223c68e47379
diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild
index c517e6d517b6..943dbb3f1893 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	dtc? ( sys-apps/dtc )
 	git? ( dev-vcs/git )
 	lzip? ( app-arch/lzip )
-	meson? ( dev-util/meson )
+	meson? ( dev-build/meson )
 	python? ( ${PYTHON_DEPS} )
 	ninja? ( app-alternatives/ninja )
 	rsync? ( net-misc/rsync )
diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild
index c517e6d517b6..943dbb3f1893 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	dtc? ( sys-apps/dtc )
 	git? ( dev-vcs/git )
 	lzip? ( app-arch/lzip )
-	meson? ( dev-util/meson )
+	meson? ( dev-build/meson )
 	python? ( ${PYTHON_DEPS} )
 	ninja? ( app-alternatives/ninja )
 	rsync? ( net-misc/rsync )
diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild
index c517e6d517b6..943dbb3f1893 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	dtc? ( sys-apps/dtc )
 	git? ( dev-vcs/git )
 	lzip? ( app-arch/lzip )
-	meson? ( dev-util/meson )
+	meson? ( dev-build/meson )
 	python? ( ${PYTHON_DEPS} )
 	ninja? ( app-alternatives/ninja )
 	rsync? ( net-misc/rsync )
diff --git a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
index c517e6d517b6..943dbb3f1893 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	dtc? ( sys-apps/dtc )
 	git? ( dev-vcs/git )
 	lzip? ( app-arch/lzip )
-	meson? ( dev-util/meson )
+	meson? ( dev-build/meson )
 	python? ( ${PYTHON_DEPS} )
 	ninja? ( app-alternatives/ninja )
 	rsync? ( net-misc/rsync )
diff --git a/sys-devel/crosstool-ng/metadata.xml b/sys-devel/crosstool-ng/metadata.xml
index 59a236975f01..69260a3c3c18 100644
--- a/sys-devel/crosstool-ng/metadata.xml
+++ b/sys-devel/crosstool-ng/metadata.xml
@@ -17,7 +17,7 @@
 	<use>
 		<flag name="dtc">Require <pkg>sys-apps/dtc</pkg></flag>
 		<flag name="lzip">Require <pkg>app-arch/lzip</pkg></flag>
-		<flag name="meson">Require <pkg>dev-util/meson</pkg></flag>
+		<flag name="meson">Require <pkg>dev-build/meson</pkg></flag>
 		<flag name="ninja">Require <pkg>app-alternatives/ninja</pkg></flag>
 		<flag name="rsync">Require <pkg>net-misc/rsync</pkg></flag>
 		<flag name="wget">Require <pkg>net-misc/wget</pkg></flag>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7eaa23527506..e9a1afee61d0 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-13-20231216.tar.xz 84341616 BLAKE2B 416ee94995b0812ac155ccfb9a5cad39529
 DIST gcc-13-20231223.tar.xz 84352544 BLAKE2B 1ec97e3b60bbf49d2106e8158e1ff66eb2e2da7d3501e3046ce12a2728e070ea0d44eff42cb5f1765ade284515b2e3c9a24ef036482b6456d5623fff3ce68164 SHA512 f3b066b27003a7c3a83f71d1670f9d662e397388e299ec2e33d674bb1d15b2443fd1608d10052b897f5159584aa3116603da33ace7c906d16e50371af5f8a745
 DIST gcc-13-20231230.tar.xz 84353432 BLAKE2B 3efe49291b4727f5d343173ed8a92f10196dc54cc49adcb330f3d82963514527ba33a25a95287fc5d08e87035736979f9cecc9d6909061af41e9e6d458a9f9ac SHA512 f7e6b79d638576ad67b8e4d4b0e151d2ba76f8bc97dca5103d9ed59138c7743eb5b2eb31e8cb85c26fa898a5d872874515c4796b84a019869c8cd98ac1497187
 DIST gcc-13-20240106.tar.xz 84368432 BLAKE2B e352f3994ff4e5626a8f278d488098b87183198d467230283e12706970596fd9f74d9245a97201c01f81da5ab21ed6cadce42467d98bc3803234be54a88fb25e SHA512 698a61ac149c766bdfefd199ce8d2a5e35897c7d2060f1754c04a5b862ee661a9d618501d7aba829e937b56ca53a9a86e799bd74d3821628a058feea700239e2
+DIST gcc-13-20240113.tar.xz 84356052 BLAKE2B 1fbfffc9f2afe443158e3f26182c8bdc3f3b599c5582762117831ecb6e6d3c1c69e8d2e5932f45eb7d534c3967e08a9f7b1bcec31aa5d7ac608bebff9f35120c SHA512 a59886f707cf18f684295031d4d9fc5b03396face1705e61852d7de98729c53ac4cf209e951d00c232f14e9dc48eee40dd92487db7cb6ad0e80f2339d6d9503a
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6 SHA512 a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344
 DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43 SHA512 f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c
@@ -62,6 +63,7 @@ EBUILD gcc-13.2.1_p20231216.ebuild 1680 BLAKE2B dd776c332de13307fefdd9ce3115e30e
 EBUILD gcc-13.2.1_p20231223.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231230.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20240106.ebuild 1681 BLAKE2B e92aea675a8a79fe9781590310f190a3bf512bd9f687becc89782c86db26ade815a65431a7fafbfb1c4e8bc6039687ab7b435e63b0867185a00421b41ae56fa6 SHA512 51c275f9cf92cfcf232579d66086de9ac41cd65fea4c2771ca346788fe752bfe1ef90d99b2bdc963d508cb8a21c44564b1592d888b6a344079d53008a8325c29
+EBUILD gcc-13.2.1_p20240113.ebuild 1681 BLAKE2B e92aea675a8a79fe9781590310f190a3bf512bd9f687becc89782c86db26ade815a65431a7fafbfb1c4e8bc6039687ab7b435e63b0867185a00421b41ae56fa6 SHA512 51c275f9cf92cfcf232579d66086de9ac41cd65fea4c2771ca346788fe752bfe1ef90d99b2bdc963d508cb8a21c44564b1592d888b6a344079d53008a8325c29
 EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01fc75222c1de50997555b70ebaf2a374dd9f61ffc3eafc1befe23ebedb36123e4f2366cb623b69f1ed566a1a3b1 SHA512 2138f692eca45b998e5675fde63a5b36dbc1dbdec36d2aecf5695c12c51caeaa578a443bc9e795de9e711a55bef79dbf5ce9751a151002bf1625df90b1bb9ca4
 EBUILD gcc-14.0.0_pre20231217.ebuild 1596 BLAKE2B b82b52e7652b6872edea7820cb8d25106b974aa5b28aa1ed68ecc721f6025e67d5f240be05e1456b644789f6404646d2ad98b64a80028183255bec0f70d5d1d4 SHA512 604729d35c656b6ab17df319e7bc78275d83fda8425e8d5835ea61a716a819108593b855c6835a3cc12ba2c664c6eaa7a114d5fd971e5cb85eeb592fb04af808
 EBUILD gcc-14.0.0_pre20231224-r1.ebuild 1596 BLAKE2B d8e4b2cadc9abeb8cf09741353d6d003df54a9673fc0acd96c10ad3cdd5aee028f2ff249365a907580d5ee251cbff654df3c439d345cc009f22e3b51a9bd4c1a SHA512 4b62319c45f694389cc69828b8e77c62ed558773f89968ce75c229b2cdf29dea35aff129871f6c85321dfb0de20338560c61fcdc77fb3f2dcfae8fb4ddfa00ed
diff --git a/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild
new file mode 100644
index 000000000000..5f50fcbf06cb
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild
@@ -0,0 +1,65 @@
+# 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"
+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
+}