5 files changed, 70 insertions, 7 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 556becc43df9..029e31ae853c 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 39a829f00a14..3b007d4951db 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,6 +4,7 @@ DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b865
 DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4 SHA512 97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
 DIST gcc-10-20230309.tar.xz 72121328 BLAKE2B 6dfcd9278c0909cd4f75835d8da584374f063767b68524cb956bb35b8b16abee78f3770c84dbd19bb5c28a0d1d69011e6c33abfaa7ea5e6688e15eaaf1820be8 SHA512 a54a39b418203185c58f76fffa9a61a8c14ac16a2aaa5eaf312d9a90ea9a51c5e7f3398a25e04dc5ffc6fb589141f4aeb0ca110a478276b4027631d1bb9f9c6c
 DIST gcc-10-20230316.tar.xz 72129548 BLAKE2B 72b5d9bf3f98bdc961d3f9e6361edcf51f7b7866c64cfd158a15a7a0b045d0cff00f185bb1da85b0cf95df5fb73ce6109a8bf0eef0bb1018970754c22d41c827 SHA512 13787d3ce14ffdc7f277263237364b0493aeb88115cdf8d100ab35e9abe08d4c845a90cd78b1c138286beef991079f3b42bb4fcf720284dff1b34606ead59ccc
+DIST gcc-10-20230323.tar.xz 72121484 BLAKE2B 45a2ce8bafc8c58e6649a0fef9eeda4eda36c65e1275a56d35ab08c1798eff4ad0985873ba674c5497ef0ef2282893d92916daea8a77ca8d4a7f2d5d71220d76 SHA512 2c281962ddadfc40dc45e38bbacb46b1dfb0dad1830bfb219a7733ae686af3613743ace12d63a55306984b9db0b0d173339e7eda7bc5b79381b505aedc7b0b9b
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
@@ -45,6 +46,7 @@ EBUILD gcc-10.4.1_p20230119-r1.ebuild 1447 BLAKE2B 645584f005ea2c00aafb7d688c308
 EBUILD gcc-10.4.1_p20230302.ebuild 1453 BLAKE2B fe070759433bfc4d214d0d14eb8998d78830420b5008d5dd7a4dc2acb5db1f3ce549a3558b884fb474831eff097ad4a0c8f7366730bda54c9ffefcc0772fbcee SHA512 2f4e1da8d8aacb17cab60fc1d215e06d72968dadb81808e9cbe2d2e80c7a0e5ef426e6bfb6d847898d7dede47dc6a715c299bf6dbca24e93bb4574437c88a632
 EBUILD gcc-10.4.1_p20230309.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
 EBUILD gcc-10.4.1_p20230316.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
+EBUILD gcc-10.4.1_p20230323.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.1_p20221209.ebuild 1334 BLAKE2B ca826cedb1606019ec76b0d4117f74d5847f9b575d4f73caeeb749ea93bf5c4eb5d88ae63fe18ddb3a43b6aa053fe237a3908d62e151bf099bc158f29308a3c2 SHA512 fa51e2c6bf5c691d4acc2700ecb6e16ee2a0f8706eeb404a2bfbfdc7aa2d987344ff64255827ccf32fc34540f618dbfe8fe0909d0914ec8eef6be62ac343d73c
 EBUILD gcc-11.3.1_p20230120-r1.ebuild 1336 BLAKE2B 89fc48985a1e7020f5369ab9cbe408c3d7ce40b7590cc66d132436b2f4dfa0494512158debbe2d2d368098cbfcdb3d7f1dc0b122e87c2e36f73d4743d042ae2e SHA512 2b68164835c2b46e5e13d69c8d45d8b1eb99acc85d6049eee89434116c378f3e17a29786e06b4be0f7089a69767ae1e070b2e17ba2f30c037d52bbb614a6b234
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230323.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230323.ebuild
new file mode 100644
index 000000000000..07a2b5e91ab4
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230323.ebuild
@@ -0,0 +1,58 @@
+# 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"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="5"
+MUSL_VER="2"
+MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		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
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 781f0d9fa128..ac4219e77303 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -7,5 +7,5 @@ DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926
 DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
 EBUILD make-4.3.ebuild 1944 BLAKE2B 875fb1c002402057904152c634ee5e588b02bee4149ab4a5a19d6fbf0f5bc1faecd19e14209951ff5908cc40f7791030d66cf8c03392c8eab62d748272b5dca3 SHA512 37e56423a20def1b5c4f929ae92fcb84988edb55799dfd17634d76ae57cf454cb26649d2c3a25a80b8c0ff3e3447cac7b01ad20f4bea262e17812b5c2ceca87a
 EBUILD make-4.4.1.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
-EBUILD make-9999.ebuild 1973 BLAKE2B 5342090aa938b96483d992cdc123d819d53f2f4ed797c1f95cab44307bf007c7775080a7bc7fbec58358301fe1adab9075738fb753edfefa2a4bb0c0fcfe7b57 SHA512 f616c84ec9b3a4d54c55506dde14751b140d57d4c54af8cc65a0bbf58c6b5395bdddbecc64c2c71eb38c8d6a35128df291c1b00e53725cf307f041be2ad0fae4
+EBUILD make-9999.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild
index f161e636a1f8..de7a808ae4c1 100644
--- a/sys-devel/make/make-9999.ebuild
+++ b/sys-devel/make/make-9999.ebuild
@@ -25,14 +25,17 @@ SLOT="0"
 IUSE="guile nls static"
 
 DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-make )"
-RDEPEND="${DEPEND}
-	nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
+	nls? ( virtual/libintl )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-make )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
+	"${FILESDIR}"/${PN}-4.4-default-cxx.patch
 )
 
 src_unpack() {