gentoo auto-resync : 24:06:2023 - 01:25:35

6 files changed, 69 insertions, 42 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8b423ea835df..fbb4e69e5aa3 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index bb2da0bf8a30..f40bf107f3e1 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,7 +1,6 @@
-DIST crossdev-20230209.tar.xz 29608 BLAKE2B 591e854f798c4abf90950a5ab229b14740cd43a77f83f85827487d2339a040eaf107305ef993a24783281f2f655eb377c60d043c071788cc2e798c746d9498b3 SHA512 41e482e6f5614d3ea3bcc3115f9aa86ba6c9302fef67af5b0c0058deba106c60f0b13e8881b7246180ce6d3bfaf77516e45e4f444317dc4eaec074850b79f4b4
 DIST crossdev-20230321.tar.xz 29620 BLAKE2B a5070ccf8b5e4fd9a6f63f6a903126a6eb199d7dfdcfbe93f0917a66894c4eef2df5749c0fddaf564fe013b40a14d88b2686700034642fb1d876b51731964a49 SHA512 c300b506bb7ed4aa5d43601b37c8298367f6e5307a97b19a23f39e9559e54d2bfdb6e2b7a5fde4d5ff0b4a9b02c1b6f05be92d1857352db6cde9a469c9159e5f
-EBUILD crossdev-20230209-r1.ebuild 1016 BLAKE2B b319bb7109067bdac8d2f2bc2d668b503e82218fde9f6b89e4ac4ec16fa8c4738c701940ac7a36f78a4ceb29be09bcee0fd881433a3fc695123b67607633884c SHA512 3e94cb122111a1211e3c15c125d107b5c456ec9b5251920296354ad35b6f15916a3cfbfa0c5a8a1a6ccacf3e7b80553b6618fec4decd1a9451ae1a06fcfa6a15
-EBUILD crossdev-20230209.ebuild 891 BLAKE2B 9d870c06d56248c1b55f02b826923b09774db6fbd1e13e51ca2b4bdbcfba204b19366188505e47bffade3556a9715fb1382f160f91dc8493763cfb49c12ca5fd SHA512 a7fbc95cedf2d57e5e94b394080af8eaacebfaa284184d250b909a7e26941b6bfaf755e4b39cb000c4ff38884a7dd05830a5aa493dc399d9913680ebfcea6ab7
+DIST crossdev-20230616.tar.xz 29628 BLAKE2B 856f24f6afcdff8e9283ef9a90ff78312123aaad8386f7003d120b5c00cd74f6ba3a911979739434696ceedc13f432d05b60ef3349ade03aa4b49afa9e59a3fa SHA512 373ebd0c776a8d687bd11faa502a7b513f1e1dce5e310a1783349c7c2ad5b2b7e9bc51a59fdcb4414cb94faabc14ec3d723b187658ce35b4ebf73e4386d69930
 EBUILD crossdev-20230321.ebuild 1008 BLAKE2B 63592cf8b38b7b323a8d3720ba7908e1c32d93c9e6f55b4f67b3248d4d3bd7ab67a42b9c204d420d99124953f3c77079113ddde536ab5275d1d2123b8391a9aa SHA512 7066c8fcdff0ea0d4cafee7e75a5ef0d27cc25173cbf43e71207c8fd2dda01b605b7af28519287e7bfcba618d68f4df82e72f721bd799cbd330145d1b896a2a1
+EBUILD crossdev-20230616.ebuild 947 BLAKE2B ec724dbaaf94be4d110d3a4ca73ba299a2c60a2f9ef089ae9e2fa41af8a447324538d864e5f755146e59a24fa301257d0eb0093a9df3073dc6017a6cc1efbb25 SHA512 f49f845e53958f4aff816fa33ca9ea953179121b83fbfc742cd72532e811d80730ef94d64dc82080078b5e985a69a7cd45da763bce9c3f6e9a66d21206a4cf9f
 EBUILD crossdev-99999999.ebuild 1016 BLAKE2B b319bb7109067bdac8d2f2bc2d668b503e82218fde9f6b89e4ac4ec16fa8c4738c701940ac7a36f78a4ceb29be09bcee0fd881433a3fc695123b67607633884c SHA512 3e94cb122111a1211e3c15c125d107b5c456ec9b5251920296354ad35b6f15916a3cfbfa0c5a8a1a6ccacf3e7b80553b6618fec4decd1a9451ae1a06fcfa6a15
 MISC metadata.xml 624 BLAKE2B 3f6609db4ad549927d9e7c0f259926de694435707aba7fabd2d08333294bc38bad42b59b7ab9f6372bec292708ebfdb88d88ee0e8dca1ed29389e33427a1d46e SHA512 4605364fe155bb8facae233aa29fadae23fe3d1f012451f8611933252f81aa3d3337ac9d68feabe059c959e2a94a67a85e6d88f7fa08d6d31e2418034b60010a
diff --git a/sys-devel/crossdev/crossdev-20230209.ebuild b/sys-devel/crossdev/crossdev-20230209.ebuild
deleted file mode 100644
index fd460721943f..000000000000
--- a/sys-devel/crossdev/crossdev-20230209.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/crossdev.git
-		https://github.com/gentoo/crossdev
-	"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ ${PV} == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20230209-r1.ebuild b/sys-devel/crossdev/crossdev-20230616.ebuild
index d15bf1ee5010..22b6c14f7b1d 100644
--- a/sys-devel/crossdev/crossdev-20230209-r1.ebuild
+++ b/sys-devel/crossdev/crossdev-20230616.ebuild
@@ -10,8 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then
 		https://github.com/gentoo/crossdev
 	"
 else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 6b419d514915..6ba2ba0314fa 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,6 +20,7 @@ DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac
 DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d
 DIST gcc-12-20230609.tar.xz 79768444 BLAKE2B 8df47b57917aeaa3524664d94070d65830b9f1f9ca430f9bf058569aca8d34c4ebb05ae183f76f9ba34da5f614b0c8ce687f10f72f8b3f81502e767372219a52 SHA512 6d3d3bb57ee15583a65b85808172b57e6c3d7715aaf27ec22cd6f12e764d57a2cf4334b1ca9eae51737af930027110eba0bb3fb8a0a3c965336d716503c08d69
 DIST gcc-12-20230616.tar.xz 79787532 BLAKE2B 4ce738aabcec26d00bc2f43bc854be0abe6f09e4e11984e6089efe420ec70caa8e8de1f183f6f43fbe0519b02794f4ee73ae8d11fc5ba4d85d11da076d36bb2f SHA512 40bc3f4690eee227f8d4f6de4abeb930aeea5f786494a377c1e628372743d177bf7646d3ef9570663cfc5aa3f136b7251267adf0c29b806b6645775552c06955
+DIST gcc-12-20230623.tar.xz 79782948 BLAKE2B 6eeabdd1495482b8bc5a6f2f90cd7d7967b66664d277c5f755f1ee98ac2c99db1552ab13b1c69f4c47d1d0b8de584e6a5f024b45e3c5934f49179cf65ca30acc SHA512 09aa0304a8a916aea7a4714eb3a7541b2015e3bdb8ae9bd40bc289553c4ec86f91b054925d2af45f33af9d20a7422949e691c0f552d68ee1d5206b4007310a88
 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
@@ -55,6 +56,7 @@ EBUILD gcc-12.2.1_p20230428-r1.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e
 EBUILD gcc-12.3.1_p20230526.ebuild 1616 BLAKE2B baf81c350b8992ac4bb899088c0f448199669a0c04329e9d23ff9457c26e3c14e842d5bcaf03115c8860d093671abc18803a647984ad47ec95cd679f081d311f SHA512 119d1e9895179a0037cb1fa2c713a3598b3af1c6268e245316698e66c06a75495d781cb1202a840df3db4e8ae79611a37ab13092fda50f12875430c932012ca8
 EBUILD gcc-12.3.1_p20230609.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
 EBUILD gcc-12.3.1_p20230616.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
+EBUILD gcc-12.3.1_p20230623.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_p20230603.ebuild 1673 BLAKE2B 53afd64b30c1d2c25b05449a2c15f81988b2465473c5b7c13b4c989a56f39332300bcffa704ac891ff563d74101eec86a759350c941dc140efcde859509b17db SHA512 a9f6d4438bf436e8d0be7801aa0f140b4c755aa4fb476b5a702d246d1453835876fa3493f48aa865658b236d6faae49d41656d8d4227c83ba70b48dcf8a55a5c
diff --git a/sys-devel/gcc/gcc-12.3.1_p20230623.ebuild b/sys-devel/gcc/gcc-12.3.1_p20230623.ebuild
new file mode 100644
index 000000000000..1ffe2b97a4bf
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.3.1_p20230623.ebuild
@@ -0,0 +1,64 @@
+# 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="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)
+	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_user
+}