gentoo auto-resync : 29:05:2023 - 15:17:30

3 files changed, 58 insertions, 3 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7f4315b967eb..c1f758756ae5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ DIST gcc-11-20230525.tar.xz 76192248 BLAKE2B 58f0ca1b6a8daa8a7fc23da47d851e6345f
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
+DIST gcc-11.4.0.tar.xz 79837032 BLAKE2B 6e3b095a5837d4b5512719f848f4b9c4b4a6d7dc40ba96b269023ea5ea84f632c42a13855c030e255f3265445a45e6d2648dfe0e2cc0ea47da87c4660b052e24 SHA512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14
 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758
 DIST gcc-12-20230519.tar.xz 79757700 BLAKE2B 81c18adedc9f0eae729a72814a47ae496c9ae78f13e9cf2f442b3ea09c577e84e3261a6004d1634125bbc77c39298328a0879eea1dab26966b85f9f10887f114 SHA512 cd24ad69a6c47a95384d8fd4fcb7e895f8fb4d8e0c4b74d1300943fa8198624e3c40b0bd7702cb78f40849a09b5069e50e36bc191bd206b36c956ca25126ee02
 DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d
@@ -37,7 +38,8 @@ EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797
 EBUILD gcc-11.3.1_p20230427.ebuild 1334 BLAKE2B cb480f1ae20bc31900948f61f48a050ed177d6303a76d555a596636767871bca8ff6446466970fbc43e2fe02f047c22a27416eb3b580812ee481b8ce4d630850 SHA512 fa62bf94450bae1fab07cc2e4030a13e2c58e06518ba44f86710049343ceeb8e535ce108225234e8b7fe50523d62414dcaf1d0148e80607bc1f6a8d0e13941b7
 EBUILD gcc-11.3.1_p20230518.ebuild 1343 BLAKE2B 8ecf0b1616754df373f3a76b1e663176eecefbd2ac79752053d8df7276046ad45187cb40900ab4f61e9ef9afb30fab0d09113476397fa8da8b06821d61ffe1ec SHA512 e7e28819115d9ec9626fbc83f5539dec278e45cb78781a48fd6f141b38a8cbf4cd459c1e134ae2636e7613a336322cafd42e7feef14fe793a8aacd29f6fafb53
 EBUILD gcc-11.3.1_p20230525.ebuild 1343 BLAKE2B 8ecf0b1616754df373f3a76b1e663176eecefbd2ac79752053d8df7276046ad45187cb40900ab4f61e9ef9afb30fab0d09113476397fa8da8b06821d61ffe1ec SHA512 e7e28819115d9ec9626fbc83f5539dec278e45cb78781a48fd6f141b38a8cbf4cd459c1e134ae2636e7613a336322cafd42e7feef14fe793a8aacd29f6fafb53
-EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fce22426a1b2a1f4fd23c4dd44bed5f15da4c67f1c108b25d8393683fef631f998b8b524aa0d356be04625c0562 SHA512 fc4d8913f2aeed856b123a4545655813fe20544d841feca5121f85291a2aec99c770d845b14ce936c2fb14b5b9b1cd85166190ec657528bcb1710c7b48385c16
+EBUILD gcc-11.4.0.ebuild 1346 BLAKE2B 278dd8483ef6034566c4ae12f9dfde8aac418129742a5c54564ff44655272c463f1cd0c2effb80aeb478b9cb8e01ef3b9e5095a4aa8a58367b5471cb778c29df SHA512 bd6b229f3aceb94ab1b944b89af9db2f4ae76f3c5387cbb333d0b52b11cd39fb0d179efb932089512d9a845197d97d17dca8a77117943a1bbf70056dc0bdcc5b
+EBUILD gcc-11.5.9999.ebuild 1287 BLAKE2B a46795c477934aed68700e0dcfe9b0dbc860f08ba66daf9538e1efab58f435349e024f7cd1b6f9a2fc1426a43a873bc916af48b09327f671a1d97911f2676b00 SHA512 1b0393d7aeddd6c8440e5838d5c432f4d6f5930da1d2635de9e32ea7fa32b40bde470610ba883e0f4fc55f6669091ea46136f4da02fd78feced0f71f63a01f3d
 EBUILD gcc-12.2.1_p20230428-r1.ebuild 1475 BLAKE2B 69112653719b589bd72fe454b963d050194a8dc3a665fc7317989368cf0ff4281ac2f8519d7fc46311a3f91528d2e0457485357e67ff72765d6cfe743f0b4a2c SHA512 2e771e67e1668bf90695cc42517f46518e445a4af6e7cb9c8532efea047a4174d40f18b256cc99beec2b5fe5abde4f1ea7cb3ad84f4491032036d6b53f941e91
 EBUILD gcc-12.3.0.ebuild 1581 BLAKE2B a5895792b8a60592ed888bd9219f85fcbe71a26ac1351e4c393753da80263b9ec2937573e9a23de51b40666d7dc1fc3f78f27eeedc31a9b3a6cce3baed91e2b9 SHA512 eacce837d30335396e5ca78b53f3cb23fd181a132cdc832ecc31353ce71e599b5e43ac6333769b70bd084cace3ae96b551216b3e53b892a0b0f93465f5465edf
 EBUILD gcc-12.3.1_p20230519.ebuild 1581 BLAKE2B a5895792b8a60592ed888bd9219f85fcbe71a26ac1351e4c393753da80263b9ec2937573e9a23de51b40666d7dc1fc3f78f27eeedc31a9b3a6cce3baed91e2b9 SHA512 eacce837d30335396e5ca78b53f3cb23fd181a132cdc832ecc31353ce71e599b5e43ac6333769b70bd084cace3ae96b551216b3e53b892a0b0f93465f5465edf
diff --git a/sys-devel/gcc/gcc-11.4.0.ebuild b/sys-devel/gcc/gcc-11.4.0.ebuild
new file mode 100644
index 000000000000..9b57b16f07be
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="10"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.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))
+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 ~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_user
+}
diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild b/sys-devel/gcc/gcc-11.5.9999.ebuild
index f693ec815844..b99c205cd872 100644
--- a/sys-devel/gcc/gcc-11.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-11.5.9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="11.4.0"
 MUSL_GCC_VER="11.4.0"