gentoo auto-resync : 29:04:2023 - 05:14:04

3 files changed, 61 insertions, 3 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index fb7718f6eff6..420d36e605ca 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -18,10 +18,13 @@ DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d5
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12-20230304.tar.xz 79683276 BLAKE2B e02622f1193ba17dd1041eae0c2f594b26806b00cfb269e683cc356d6d405ae8a49e60823ed6f814d2aac820ef01d9004f68d628a853be139fa6a70e8601ba2a SHA512 0c23a8845c8f202b0c0e4aceb3104bf76c0aca9171ba65d292057703d160fc4ce0b0d7c8876cf1bb30f998c4a5a0a8f3c4165dd4d8d316019cff0dc19aa62182
 DIST gcc-12-20230421.tar.xz 79737436 BLAKE2B 2522ecbe91513d4f008b6a3f2acfaf13f925b9f95293dcbcb04499cf69b7c6cd1c5042113a0e545ee2afd78cf99c96c36042150e450ef33ff040c9fa9fb9eefe SHA512 140ff8e4f387284e070b22f22e51f3aa09ada233dc2bca90894f4b0dbd3e9532f266c8606bea6152afed3eedb853548247f133e332e23f7c6bf380fa61b54b96
+DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
 DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
 DIST gcc-12.2.0-patches-15.tar.xz 15352 BLAKE2B 36e5a0fa40d1a202da02187bc752f20868375e5e2d95b88b2d5f90625da223286cd006f258d390a004d0fa9d019e04063bb79900590333854b5d668233c7a91c SHA512 150ec959d45c883bf15b9801baf53665b78d57aeb6fe135af6eadad5fff36fb38431e51f95e5e3bf4c43b54e873f16f26d7746bf4c81ac57fff7acbff0db342a
+DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
+DIST gcc-12.3.0-patches-1.tar.xz 13496 BLAKE2B f38cf0235842393bb92b9c399e013fb713c9affeb5138d54f6ed86aa52a429f17f1f85ef35e511e756c1456de70f184918d93cc57e09c42788209756ec8c35b1 SHA512 dfb04a6330b29cd8035e2da36a5674f210b8ab7c71c1d13b8491e7b0961df0868ce8a279dcdb135ae66eee97dfcfdbbe819e7194e86acee3ba15ed38d7e107c8
 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
@@ -43,7 +46,8 @@ EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fc
 EBUILD gcc-12.2.1_p20230121-r1.ebuild 1476 BLAKE2B 108f19cabfc3a958c6d61ad2c8ad0955ffc474e9f76ede125dc25c4f94c4d2b692ad9a79b0124657a6d64852cf5beea420d5ec3ecc7ad652573d3fad6f7569cf SHA512 3a8e8b8ef072b6f0f29cc3a2a8215aa97845f4ed84a528eec5de3b61ba2a07628b049029969d64aa86fea60d1e601c3725b16f3f1ab976d17f6695aed418d312
 EBUILD gcc-12.2.1_p20230304.ebuild 1481 BLAKE2B 49b5fb0c157e0edd792af216963b3318044c5e2fbafaede67738d96002e691db5ccc4f602cba4ac9589e6858fd58ec956ef0b0b82053f7312572d394b1e92b49 SHA512 a9c267a190cefa26e0fe6710a4243798faeeab3a37262c3663901ae32166b40ab53db59eb7eb232449832ebbf6ec291f723ae5fb9f6b15240e8fd22a7d5ab107
 EBUILD gcc-12.2.1_p20230421.ebuild 1486 BLAKE2B 516464c6dc34fb571f3de6f5c68b76dcdb47444ee7a97f6ca31824a0bf125ad70ec491600b211923b5b9611dfcafd85b749c01950f5a45db6acb54a780c9d4f1 SHA512 6ebef3954ddbba3d74e55ae70995f1c6108a52aed2066113cdf29b21e7eed8754d170377a5b4ae1ab3561b16964b9796b198cdfb9e40931d9529a27349cd342b
-EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 0cac4b67933abbacf0037f3e89b4209ea2a8147b62d4c2b6e61701711ee421d240899c4c9bdb201cdfceef14125227109b4c5c3524256a06b206887a4d0f142e SHA512 ac75c2434ba6a36655749ed371b158360a7e05570ed41e39dac0a15ac6eb24810f2408a2d30e50206e4250c567123377e14317c07ab1e6b5771599a3b5e0ced0
+EBUILD gcc-12.2.1_p20230428.ebuild 1482 BLAKE2B 0a0e7de8290be6349272f7808b55ab2b13012b6a0aab7901dafa96b81faec594119c7d279f799da726a4c26564733c389c5a029a006151371d7b4bf7b3a67a95 SHA512 ba1eb9072e555881b8807d544434eff5053fa948153446629c90021830e8744bff7ea2ec992ed4d407e757354ac4faa739a7ec5b4ec02d5593e6b95b680e80ce
+EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 8246fe30de8cf3d515b1c5c23eea470de257aecc452fcce47e72497b310c62893c39275db02245a12a258b06c4ddd695a8346c9b539efca2a8e1d64aab0a8955 SHA512 a0fa5d4f5e6d1545e13d33b6fa45709f7dc5fccf026d060eef26752d7000c21b913276609abb6b174b2d04e08de3c61f8c4b126acbb196c767a8886ab7999ebb
 EBUILD gcc-13.1.0-r1.ebuild 1664 BLAKE2B b6fd223eeee8e6b0b02a5d5eb33437b1ba036bdf09a13aaab95318682f83d8dd1a184eb6afd8bef2c34013bfd8d0f38a108f3db0d6fbfd565f29d363cba98d3f SHA512 7e8eb3791678e456bf2c7717a4b8c95322efcde8dc3030f035cb9577fbc416a2c8b567e588036f94bffa2dd83bd00ee98a797d50d65388a3fc022819e4ab2c2e
 EBUILD gcc-13.2.9999.ebuild 1593 BLAKE2B 6ada03c3a63cbdb90a06954f02809b1f7aec31130c010981554ef8df4db41d79d856ee514694b9f900983e7649cc94929e3050764ff6fef5a8227701710d423a SHA512 89b624dc6f8a1187f3d36f9988409c27e1e2133889a1135be0ecaa3aaa7c381f780cc20aa8095be9bc31c4e16b96128ba50dc17431305bf3f334025956a95746
 EBUILD gcc-14.0.0.9999.ebuild 1591 BLAKE2B 8a463d1b3d812a22a29a4aec27504bc138a69939b328f6fecf4eecaa90aa51acdb2e53fdf5ca5d69c5159019c354ad9ecaff218181f06fbbd9a0da43fc70c962 SHA512 67e09c08daf026d9c61f8feeafcd595c37103c04879641f6d79ef7ceeb0d44d84dd81bc340e77d031c8675a4ac858ea5a555fe0dc76fcce57991361b2d09c1b5
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230428.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230428.ebuild
new file mode 100644
index 000000000000..7e1c1e81a48b
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230428.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_DEV="sam"
+PATCH_VER="1"
+PATCH_GCC_VER="12.3.0"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.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="https://gcc.gnu.org/pub/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() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.3.9999.ebuild b/sys-devel/gcc/gcc-12.3.9999.ebuild
index bf3196502bb1..c46b53fc8ce4 100644
--- a/sys-devel/gcc/gcc-12.3.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.3.9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.2.0"
-MUSL_GCC_VER="12.2.0"
+PATCH_GCC_VER="12.3.0"
+MUSL_GCC_VER="12.3.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)