gentoo auto-resync : 09:07:2023 - 04:23:59

7 files changed, 76 insertions, 9 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 83c812cf034f..ccf554ed22ff 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 4af0bc175943..1a0bc31f1e75 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -8,7 +8,7 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e40
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r3.ebuild 2585 BLAKE2B 97b90325fb9897864f9016b41ce151aa8fafd71d8665c13d2848be69d16a19879e4d9b11c49d43891f9a047d9db3320d8bb70876204e84d075470bd92f8e3233 SHA512 e6a0917fa5cc9b6a8288390c7a746e093f8682f6d7befffdc25537a0058251efeaf9ac84fbb803c693520b85d61fd545e875e446b6b0010d61ead4bcfb5e4311
 EBUILD automake-1.11.6-r4.ebuild 2137 BLAKE2B a9fe92bd9017a8128116b5debe947674c8c7ab7611e230ab7a37dbfe05076b77e30411d766184e2f77ff81b4174d0087e94387e176ccbaeb06ec36e108f029c0 SHA512 3b3f94d94004e2326bf2afdfbb075e1a7716fbf235ba12ea7ff2b4a0c3a2c61de860ee3e1751dfabb5edc486a6e57e51fd5f22a55728e1987a68150bf718242d
-EBUILD automake-1.16.5-r1.ebuild 3054 BLAKE2B d53f8e2861bcf43736d1b2e515aee1349830ae257be3d9a390845a8714d106d6fe8258d49d455610fce262b011e32cb86bf6a237f84fc8f1c763512ad81d6a94 SHA512 76bc03b00d7608573c26be7f918d6ef6c5b9b4bb09ea1bb9304ce2e38229e459bb154beeac286de3b086fa388cf923905a89c26f3cf2e1f2024a70dc729f9b6e
-EBUILD automake-1.16.5.ebuild 3497 BLAKE2B d4acdfb80ed54916cf743a0ebac80e83e81f66462e3319e74915e9b89a1532aa60a46b9f190433cab840d1ce950c798de895bc834ca840722bfd2245ba404435 SHA512 09296de823508dbc81e6a28fac18581afa6ff9a784a3f0e8c6c3a2007c5a5c89c33db740618e1e47d06891327528f14f5692e441f7682503eef8226aa613bed7
-EBUILD automake-9999.ebuild 2844 BLAKE2B a87956d537a45af6850814a9c4c21151e3468a0e39a3d3a649142561c2db6c301cd3123225695ae22117f59451bb1e4e1b00c83356d7837f1a7165bc5c5e728f SHA512 74652d45a05872e03518e3248f407906ef0e85d50dff1dd7304ed4d812a62d681316133a3afd0af31893d675abd335d23716c12f02ebe5f7de5d858145ff5634
+EBUILD automake-1.16.5-r1.ebuild 3063 BLAKE2B 3328878a3aacf22e488ed47d61c2c1ac5ad9deddae163c05071a03d6b075f32cfceb111bcbbe25b16942bc66c646cc3a18aaca5ceb1c9d08e09981b0b828b9d6 SHA512 cad7b62028e251f47965936e527019b279525555b52910ae4f46c3cffe3933fa28448cb1e504b3348329459297e8a282ee5306887c966f4c6b8e7ef0573d7787
+EBUILD automake-1.16.5.ebuild 3506 BLAKE2B e909a120eeb79c658f5d630f15da577d05a2298c1b8d2458c0bd2d27cfff6cbaa95929b0afcbd5c5856927a9ea75e5c762046c6737fa6b146b6920eb33093c26 SHA512 1f703b55d5cb9d01f1d9bda2ce10cc1ce8c45ae3da00f2c9e74aa1db897dabd06cf8a72ee548800d4abf801728d32d510b0c2ae1692047be8a7f42c96386c58b
+EBUILD automake-9999.ebuild 2853 BLAKE2B f8c9d0dea75e234a959486450afb139c5fc7e4fcf17360de2f52762d8713725e8b2c21ab23c5839746a234f812c8be846715a49009fbd71f81c0362dce5ff247 SHA512 435e169f301d00ce98216f9bae8bb1205552a5ff0ab9a7692eda66a117c40f20b25fd5db35480ec59e311e885f528b4ee574ef6cac7dac9952b5fa9d5d34e77c
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 23a2236bae2f..4e9c907a8a1a 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild
index 779a853293c6..156318f9ba77 100644
--- a/sys-devel/automake/automake-1.16.5.ebuild
+++ b/sys-devel/automake/automake-1.16.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 571985fea6d6..8935774850e8 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 6d482b3e58b4..806affe63e7f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -24,6 +24,7 @@ DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69ae
 DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82 SHA512 87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152
 DIST gcc-13-20230624.tar.xz 83969940 BLAKE2B 8a145ade87b38226d25161a0494b781e3cba1cfda229ffa367ed570aa97cdd3c38a520ae14e9ed9050fe844b229ac7bd8c2ef37544c472d39b8d75f7b9ecc3af SHA512 98e5fe2e780646f67f6d8ed2e9f8338a9be27ade40c2cfa78b7fa3f9c9a0a74771292b3eb81c5713f230f90bdec46104fa655ca4286bb9e6065432ae10122f54
 DIST gcc-13-20230701.tar.xz 83971804 BLAKE2B 3f5bab12f47e44f57556c320d2d9a8ca4a64ba392af62e59d34188aca1cad759358fc3082ec3b959c938d03f6819f9c2974f6252754e0038baec6652f325cb5b SHA512 68d5ade55c082ef80dd4b66bcac1c5fc59f82f5dabaf6b4f703d7f4bc04a92c34e9a554bfa7794861630af97df668b5c7b81548ee7692e22cad25c0a5eb651ef
+DIST gcc-13-20230708.tar.xz 83997508 BLAKE2B b19c5f8bb90bb38f8e30e5cc04ddc7c26db007b309ce4007163b0be2d73fa0f8adbbcc318e9933e58ecdb52fa17d4b70221df4ac48f1b5fa28599e418bb71ae9 SHA512 c3fc449a6ec66786d3a6bd665749eed94108295e1c787c95e27e46311fd86d17f0e501636f2fb5db5d9f90d4a137632933056a8ff5fcb1988ffd4310adce95e3
 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-14-20230625.tar.xz 84461556 BLAKE2B 231980a191e231a3f7dabc8f69ab364ecf1f3cf9a165a7e0bcbb9ad4ed17bda0616be325fe6cd2996321f6bfbc69f5e8d4a13513c3126132a0797d9d1c5c422f SHA512 d794a977a7a6b759729386eb13bff934f90c093716c47e89b7490dbd36ea489f5dfb03d0c6c0f7d57e1d4214dad8a82d886438c8eb5af53620cf2a85236f0b45
@@ -52,6 +53,7 @@ EBUILD gcc-12.4.9999.ebuild 1589 BLAKE2B 8de913409a3303b99e08e719751855382983fc3
 EBUILD gcc-13.1.1_p20230527.ebuild 1675 BLAKE2B 79870241df5096103bd49f812832100faf0e6663d97f478fa1dfa73ff31283b86453b0553a4d207da9bd3d4149fc79e9665efe457a7110616908f1e96a4c9695 SHA512 a865581a2f9f98fd92dfeb4a712909e88ca1bd02d3c983be2d2250de8d2b5cc7f8dcb5bc306d70d41feb595d65d5a61c29696dee01b328897768a68625c1a400
 EBUILD gcc-13.1.1_p20230624.ebuild 1673 BLAKE2B 53afd64b30c1d2c25b05449a2c15f81988b2465473c5b7c13b4c989a56f39332300bcffa704ac891ff563d74101eec86a759350c941dc140efcde859509b17db SHA512 a9f6d4438bf436e8d0be7801aa0f140b4c755aa4fb476b5a702d246d1453835876fa3493f48aa865658b236d6faae49d41656d8d4227c83ba70b48dcf8a55a5c
 EBUILD gcc-13.1.1_p20230701.ebuild 1673 BLAKE2B 53afd64b30c1d2c25b05449a2c15f81988b2465473c5b7c13b4c989a56f39332300bcffa704ac891ff563d74101eec86a759350c941dc140efcde859509b17db SHA512 a9f6d4438bf436e8d0be7801aa0f140b4c755aa4fb476b5a702d246d1453835876fa3493f48aa865658b236d6faae49d41656d8d4227c83ba70b48dcf8a55a5c
+EBUILD gcc-13.1.1_p20230708.ebuild 1673 BLAKE2B 53afd64b30c1d2c25b05449a2c15f81988b2465473c5b7c13b4c989a56f39332300bcffa704ac891ff563d74101eec86a759350c941dc140efcde859509b17db SHA512 a9f6d4438bf436e8d0be7801aa0f140b4c755aa4fb476b5a702d246d1453835876fa3493f48aa865658b236d6faae49d41656d8d4227c83ba70b48dcf8a55a5c
 EBUILD gcc-13.2.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01fc75222c1de50997555b70ebaf2a374dd9f61ffc3eafc1befe23ebedb36123e4f2366cb623b69f1ed566a1a3b1 SHA512 2138f692eca45b998e5675fde63a5b36dbc1dbdec36d2aecf5695c12c51caeaa578a443bc9e795de9e711a55bef79dbf5ce9751a151002bf1625df90b1bb9ca4
 EBUILD gcc-14.0.0.9999.ebuild 1568 BLAKE2B 02ff0ed9ee64898714a411d4d6dce9ab4ed30ec1f8dce58036da4cfdd033281868c82b1a9e6da669898e405194f84be3db34cbf7a8b0144d2049558f30370b90 SHA512 5aa6f2841a026a8b021f3fd0a6ff47f11f1a7039454cb95a8af148f247792c90d08d254b16c1369e0aabf83da53add611594632a951fa075c06daee837eb27c9
 EBUILD gcc-14.0.0_pre20230625.ebuild 1595 BLAKE2B 6986a9323f7bbc6c814b68b40333c6279ba7f1b1733695b12568e59390b991441b03523b015fdf67e8b0249fdf874e36a46993d2357d9b24b3a97b79ca4bf8fd SHA512 c2cc081c84cd0846da49b81e7835e8b35365d51c4a014edb765a410e4a7b528928f32fedbca2e40aa0d2da80ccebaadada67c1b746a70b6e7910d71503cc6097
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230708.ebuild b/sys-devel/gcc/gcc-13.1.1_p20230708.ebuild
new file mode 100644
index 000000000000..994717045fb5
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.1.1_p20230708.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="3"
+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 ~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
+}