gentoo auto-resync : 08:07:2023 - 04:18:34

3 files changed, 20 insertions, 15 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 788430b69149..6f3637ae229d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,11 +2,10 @@ AUX gcc-13-fix-cross-fixincludes.patch 792 BLAKE2B f16dcfee5760380931642520bf7ae
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
-DIST gcc-10-20230517.tar.xz 72135000 BLAKE2B 8ec87088ace2bf7cc355357b8c9b12e61646366ee1204a360f3be0dcc8b7d426ba5fbb7eb46b4da4c937f5b63d2181a3935f2894f40556f1472dd2a91197b38e SHA512 ae685e1e3fc3460ea49bd86b2b583ef97c71ed279cce6f06b293bd9c7f7ac5ae477b2f2057c4ed927114249e41f6f7978f13db678cd92935dc1250bdd11c94c5
 DIST gcc-10-20230621.tar.xz 72149848 BLAKE2B 83d367c1fb8e68b3e61273a324cd3829ccd3091a1346bc88f76ee2d6c86fb4c644d30c0594a024df4d53c6c6a02eb2b98ba44ac6db7e8ea4ddb96c795e202d9b SHA512 b03520cf64643ac887e4c32c7e3a31ed54ff96bd5421ff2892675e26ae188ed8dcba88edbca79ec13bed3a052a98eea92fdd6bdd76ad1131a16f7c637a36360d
-DIST gcc-10-20230628.tar.xz 72167480 BLAKE2B 8b8236585cd1aed7767772088550ce1ded9d6e3d1d0d626eac851e92a29318729a2e2941fe45bc503afd3d50b3e2ba8de9ed74f0e7d980b9127e184a9d180a84 SHA512 ccdabb31614dcfa1500dd2c62340d96474823360a9f63a70485e53d70b222334d56d45dba686f706b6c4a98905f930ff9b92be2b4cc195bc89b85747d93d29a4
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
+DIST gcc-10.5.0.tar.xz 77846412 BLAKE2B 9b71761f4015649514677784443886e59733ac3845f7dfaa4343f46327d36c08c403c444b9e492b870ac0b3f2e3568f972b7700a0ef05a497fb4066079b3143b SHA512 d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d
 DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf230e506773c85977156b187f12664f2cd3e0992a1faefda8ec88ff85d1a8d12795121baadc7e8b9653d69a8025e46e SHA512 8dbc5a4b54f2bc52458914705af40a00b33e46061dd5b335b4b4a6e96d17206fe480d3fec564dd11ebcca6168f054984d706b1b26b7e694e8b327692a13ae7d1
 DIST gcc-11-20230629.tar.xz 76208088 BLAKE2B c2ced5e441c93f985a8747a763f908dbbadcef905a1038db89a771c478c15dc516faca038daa4ed6356ef6848b132177a8a0ebeb333abf6f7149445782f1eecd SHA512 183af1d37650d57232d56f4a46d2f17064683189061b55db314ab8e66e5ecc8d8cd31114c1427339c1dda242a04fe989730cf5a169f13dc6629c60ccd61fdd53
@@ -19,6 +18,7 @@ DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac
 DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d
 DIST gcc-12-20230623.tar.xz 79782948 BLAKE2B 6eeabdd1495482b8bc5a6f2f90cd7d7967b66664d277c5f755f1ee98ac2c99db1552ab13b1c69f4c47d1d0b8de584e6a5f024b45e3c5934f49179cf65ca30acc SHA512 09aa0304a8a916aea7a4714eb3a7541b2015e3bdb8ae9bd40bc289553c4ec86f91b054925d2af45f33af9d20a7422949e691c0f552d68ee1d5206b4007310a88
 DIST gcc-12-20230630.tar.xz 79795960 BLAKE2B 8d7a10afbf63f0de348f6e32913320428a2017f0ced5f330dc8084ff8f954c0c73b638387eade230a0c47ede32917fd1b89fdc31d83d02fb226600e1dc72528a SHA512 f7bf3d9a12f2b96c242a7dfaa17f47bdf368a787bcff1da5efdf1cb07910c2506d3c944598eb47a0fa708bcccb6b1a5a6994122d44fc6fd4fda09d0b0169b430
+DIST gcc-12-20230707.tar.xz 79783628 BLAKE2B 58ef775c177acda2afc46eb0211902424256cb4a12eb8d39e5a50f84b04626b0392ffaebb792b526c17f5b3e8b725e1df60975366cde8a908152a7a61ff27ce1 SHA512 da17f92aa39339b357ae8a247e68364c91d377b9baf1c7c13e95b64ded6c69df955586a60411c6ab52b81959442af558be7e3e97ccfdb19d720dd816ac937eca
 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-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82 SHA512 87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152
@@ -35,9 +35,8 @@ DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c5
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.1_p20230426-r1.ebuild 1394 BLAKE2B 68e7a1e51fe470f4c3d0e3ce412edfe2bc68f156987f984e1a5acc35a2a708215bf6c92ab65df0d7c062157d953d6a68069a5669440f12a8c1383a234a52abbc SHA512 cc09808a6826e0743c70ba0de9eac6f26556b8bdd839c83a97ea491705a1d840e9ece77ec24fcb5710ea70bd812519eaaabeb4f02cec8e087d70696ac1e9d92a
-EBUILD gcc-10.4.1_p20230517.ebuild 1402 BLAKE2B fdffbd8f2d5d0b4ab24622d2a9009b2c387eec4047e9b681b1c3cdbbf39150fa79a7f51890bd1eadfb1d35ff50f21c32d2cd857843d2161b4926981188446039 SHA512 6acf7c1c649878423ff8f407d717399098c306c7bbcb01afbc46c0dc8f7aa330780fc4f76f603407bc322ef92bd77a06dc55c8642710eb48650c28740d1cb839
 EBUILD gcc-10.4.1_p20230621.ebuild 1406 BLAKE2B fc4eda87a7f31859929f8921bd80daa28e8b0c7ed6b039414e3d7af3009a37a8f82f96630c019dec3c461351076a63da7eed89e62bd75f89b637d51a1a4d2b31 SHA512 aa6acd7c72aa5390fec758bf04261f8c26e0102db61f026600f2068eda33689d4a1ae6aa7e80a4032e1cc045e5f164f56b9e2e2e462d8f1ce87e3cc2b9c9b384
-EBUILD gcc-10.4.1_p20230628.ebuild 1407 BLAKE2B 3b2046642d36b3b6fc58f3fcbfcfdbe6ac20e18d7875397fc2fdcd72f249e4800f8b10dd3e25ca5663e8b669c1335c519ce7540272677ac5a344f35d7a92b60e SHA512 c4b74051c19a57b5f0aea663b8110a7f3ddebfd4f78d95234370c19fec6a39f62f5ee8f4961c2b5c0b223b7f5e47a12cbe66f1591bf6960be16ef56392a8f891
+EBUILD gcc-10.5.0.ebuild 1406 BLAKE2B fc4eda87a7f31859929f8921bd80daa28e8b0c7ed6b039414e3d7af3009a37a8f82f96630c019dec3c461351076a63da7eed89e62bd75f89b637d51a1a4d2b31 SHA512 aa6acd7c72aa5390fec758bf04261f8c26e0102db61f026600f2068eda33689d4a1ae6aa7e80a4032e1cc045e5f164f56b9e2e2e462d8f1ce87e3cc2b9c9b384
 EBUILD gcc-10.5.9999.ebuild 1375 BLAKE2B 724dd0f65fa803b5c9cc5be75d6ae6ef0cc9e401e97bca70cd66fa18b6b70b410291278ec408ce2301f3826c009703ac69292cf3b0805cd5c4fc47e89979ecbb SHA512 2e065abca7ac5ef8baa2c31a0493bee28a56778d128de43efb775a5520038d0ce2587198a80e24e12398b874d50cc52e9e57c5e2f984e87e3ce3b8316617403f
 EBUILD gcc-11.3.1_p20230427.ebuild 1605 BLAKE2B 65fc39711c23a635257ca2620c8f5f040c5a90c8df18f5c2b5584f646872a95ace4454d32a658d78afbe167e19193a11a02e777489af98165aa8565088822b9b SHA512 641ebcf7e7f93e51719cd20a72f8e94c31233fb57208b5ebee59994464c98254b04a2669c029239f1337c30a353903545a51dc4a7565dbe3f49b02365f643a21
 EBUILD gcc-11.4.0.ebuild 1610 BLAKE2B aeb912c62e629e9eeedf2ef76d8df4c7aa001543a788d01e17b64749a4736d6bdb040adccfbc2cf7980bcb48879652f879a618975b021d55bdce1316ba1f0197 SHA512 fc0db0a1f1d246b6f859a699ec0612e96d2c4a777e7815a8867d3858e4eedb2754ac0ae64e4159e3c1f3f14ab9db0dfb63d6e3bbcfa013f60d7469c5e9c9e7ee
@@ -49,6 +48,7 @@ EBUILD gcc-12.2.1_p20230428-r1.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e
 EBUILD gcc-12.3.1_p20230526.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e89e82e15fdfc2a0188dafcd5ee3050dd68e20cb765e06eeae92f1b4b965b9f678bd23786291d207984afe0365728f71a327 SHA512 a844ec1b656ade09280433231828e28bdfac9750e277fb5f7b2c905199f62d1f3d59c5c283706f8e80d8f8e5059a7529cd0b5a3c224a55b6e97faa335b8ebe74
 EBUILD gcc-12.3.1_p20230623.ebuild 1620 BLAKE2B 3866983ddc8c6811e00c12af0051e80bfc7f0651a5ef6ca4af9ee651e2efea89a095a616908cccdbac88d8c1baa5ba2eaba7ce7e94f9aae6ff3a56ff52bcd0c2 SHA512 81a426e6392a42d3a28eb6aa5a2de535771fdb87224eafb60ea369c902f27a42c8265565b354d4bbac8daa968849a20370c529c62c9367f0cf58756124d08e0b
 EBUILD gcc-12.3.1_p20230630.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
+EBUILD gcc-12.3.1_p20230707.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
 EBUILD gcc-12.4.9999.ebuild 1589 BLAKE2B 8de913409a3303b99e08e719751855382983fc3208de45a45e9f42d334c3f5b2b387b910791af804cae0c646c139d735235802bad96b4b84fe54f3cafd46cfec SHA512 fc445103363a11b7628e3f46ad8dc4b4c8e1f942dfd25078b41638779f7e4580fb9acff78812fb1039e5410e6dbdbaeea71b99f2d52ce3c4f04ec30dbf72ef7c
 EBUILD gcc-13.1.1_p20230527.ebuild 1675 BLAKE2B 79870241df5096103bd49f812832100faf0e6663d97f478fa1dfa73ff31283b86453b0553a4d207da9bd3d4149fc79e9665efe457a7110616908f1e96a4c9695 SHA512 a865581a2f9f98fd92dfeb4a712909e88ca1bd02d3c983be2d2250de8d2b5cc7f8dcb5bc306d70d41feb595d65d5a61c29696dee01b328897768a68625c1a400
 EBUILD gcc-13.1.1_p20230624.ebuild 1673 BLAKE2B 53afd64b30c1d2c25b05449a2c15f81988b2465473c5b7c13b4c989a56f39332300bcffa704ac891ff563d74101eec86a759350c941dc140efcde859509b17db SHA512 a9f6d4438bf436e8d0be7801aa0f140b4c755aa4fb476b5a702d246d1453835876fa3493f48aa865658b236d6faae49d41656d8d4227c83ba70b48dcf8a55a5c
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild b/sys-devel/gcc/gcc-10.5.0.ebuild
index 89db054045a1..72bc0e8a42ec 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild
+++ b/sys-devel/gcc/gcc-10.5.0.ebuild
@@ -38,6 +38,7 @@ if tc_is_live ; then
 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
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230628.ebuild b/sys-devel/gcc/gcc-12.3.1_p20230707.ebuild
index a3ff836547a0..1ffe2b97a4bf 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230628.ebuild
+++ b/sys-devel/gcc/gcc-12.3.1_p20230707.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="6"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
+PATCH_GCC_VER="12.3.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.0"
 
 if [[ ${PV} == *.9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
@@ -16,7 +16,7 @@ if [[ ${PV} == *.9999 ]] ; then
 		MY_PV_2=0
 		MY_PV_3=0
 	else
-		MY_PV_2=$((${MY_PV_2} - 1))
+	        MY_PV_2=$((${MY_PV_2} - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
@@ -41,8 +41,14 @@ elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
 	:;
 fi
 
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
+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=(
@@ -52,9 +58,7 @@ src_prepare() {
 		rm -v "${WORKDIR}/patch/${p}" || die
 	done
 
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
 	toolchain_src_prepare
+
+	eapply_user
 }