5 files changed, 112 insertions, 0 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0e0ead46fa15..763e17bbf368 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-dickey/Manifest b/sys-devel/autoconf-dickey/Manifest
index 95e1c6b370e4..405d32f4ca37 100644
--- a/sys-devel/autoconf-dickey/Manifest
+++ b/sys-devel/autoconf-dickey/Manifest
@@ -1,6 +1,9 @@
 DIST autoconf-2.52-20210509.tgz 874991 BLAKE2B bf8ff6496887f23cce167dfcc5177117ab5514996884998b3237c21e355b34301aabb71dacbff1e171ef21530d745345e584d876b3b5571f4faf863135b4269f SHA512 0203bbe096a2ecbee6bf012fec10a8f90e0b391d5988e202d2a1c718aa856d6c4953fb5e2be215ae635cd6b876b0229d6de1ffc7e2b35cd14684ef7c8294e546
 DIST autoconf-2.52-20221202.tgz 877960 BLAKE2B 52ef77d98f5d6e64e4c13e09ef92b3141703238953ad27b6e232cb62407cd56b07a1cad79f4405606f400246e85650925a7035b73119cda70d7faf049b61105c SHA512 8becd8791dbdbcf0801bbed8cbdf70666db10e3c6882b3f8e63e1cf04163818345be573018d96a2e0a28770e13cc452126fb9cb23b223df598c50f59e69c2d1a
 DIST autoconf-2.52-20221202.tgz.asc 729 BLAKE2B 64a528da36243271d1ae1e95e4182c663c571021e617554076bed78e5c12a3f16a2554e3b41ad6372751090ac05770bc59f090ca1e5226aa2c7c5fda48026bbf SHA512 dadf6805072cc072bbd16a939b285c7ab378e23aa0b9e6c808eb11bf40b679cc97cc748c524ac7255a0b47a4815dcd2796c606f963dbbce52a93956ccc8814fd
+DIST autoconf-2.52-20230114.tgz 878069 BLAKE2B 96e93585088b87acf0c3336e390ef098e9aa5569e2aab2d05e4c963894e076c991b65d93476fc671395d399a7078f8b618166e39052933352f366f8d2ab849d7 SHA512 41427e45b6b9c36dfd65f9b00792e6edc135e3b5fe06b2a0870f9380d96d567036fb3f30e8be28c9443c7557fadf66d1409f59def127a824478db89b5f29f517
+DIST autoconf-2.52-20230114.tgz.asc 729 BLAKE2B 9bcafe59763d2fb169e498ee5542500184974697838497dcd722d43c14e90475e004c0c7ae9fe2bdac523cb9d14ebe82a19d10c3369fe2a035c2f44b60c4d676 SHA512 d60d0155fa20f4808cc49ae06e76a969b82e2b2e5ea4ecd08182b34ca224401eab012659d2519072ca8afdf1ddc2febf8af090cff28990e2b4f2372da13635a8
 EBUILD autoconf-dickey-2.52_p20210509-r1.ebuild 1203 BLAKE2B 894bc874a0bebe84765fd0068f3d3a9007600afdea707dbc2fb1791fe42ce20a144affb318fed6489c5d8ab6b7a26283e25b27d1e3b659c66a89249bef2c15f1 SHA512 fcca0e04cc9ed70aaac42a2eab52fc9b56a4a3d7ffc3b0ad8b0d4eb2ef158779658bdc7d5e0ee6899b2412e8d1432929efe9e6d569189b1fa8e3b8aef8429ea7
 EBUILD autoconf-dickey-2.52_p20221202.ebuild 1436 BLAKE2B 91ef3bddbfce1b9096d076e8c42bb7278afd81c77a5129e25e2c0c190c11488648464fa403fafe23e7dd61006d7a113458182c535cec12ef26ce4af93128b242 SHA512 bfe79793f451efe8b461362c04cbcc081d0bda05face37fc6f3f020b936da59f605116114cd6d60155eb7e87f85e515dd516c166dec89147e09634ee0101cafc
+EBUILD autoconf-dickey-2.52_p20230114.ebuild 1436 BLAKE2B 3fed69ee95776386f54d1d769dc33390d570cfa6e9022ed901d2e59b5e8fb729005dc7522eabdf3ece415e43e1810c0934098f69d9a0ce20f8220efab2a5f937 SHA512 9f2e89b9995e3c72af0d8f75c1ec4bea87c05241bbe8b240923f847ec2de08fa5182c9d18c7be32878979bfd9cf93efe964d81288c18f861577197b4d649dc62
 MISC metadata.xml 443 BLAKE2B 3702c6704855d1a2ea5ef6441556539cab7d16977b789e9d4dc19705000f55f27de4a74c343f5f1ca985dd6e62b5eefbe27bb41dc2eea01d85676ca0ea140dac SHA512 76e9b97ac152a50a2e58feb20cdb56d7c92cac553e4c09a3686e7d0013c240da6d2d100f953b1fb164d71cd3cb6bacc36e2da980697254163901643b517be091
diff --git a/sys-devel/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild b/sys-devel/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild
new file mode 100644
index 000000000000..96b243b974c0
--- /dev/null
+++ b/sys-devel/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: adapt toolchain-autoconf to take econf args?
+# TODO: review our old autoconf-2.52 patches?
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+MY_P=${PN/-dickey}-${PV/_p/-}
+DESCRIPTION="Fork of sys-devel/autoconf for Thomas Dickey's packages"
+HOMEPAGE="https://invisible-island.net/autoconf/autoconf.html"
+SRC_URI="https://invisible-island.net/archives/autoconf/${MY_P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/autoconf/${MY_P}.tgz.asc )"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6
+"
+BDEPEND="
+	${RDEPEND}
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	#if [[ ${CHOST} == *-darwin* ]] ; then
+	#	PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+	#fi
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		--program-suffix=-dickey
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# -j1 for bug #869278
+	emake -j1 check
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 23d9f6a05714..1f6fcc233b04 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d8
 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-20230408.tar.xz 79713052 BLAKE2B 932457993304a40337fc25864ce7d1bd2c5b31a91b4dfae19a0ecdb93658b3ef68e5f4a1911f4921fa26e4388664274ade2c6e3ba852e1bc9fb8e1f2f0d6513c SHA512 c75ac4be453f2f95a58de7b34f80d1050ba6d5a71b7987ac7359315f8e682c76ae004d9c34b4b6bfe78a7708319e51e9cdb1bdaaa3cb15e76214d60557ce39dc
+DIST gcc-12-20230415.tar.xz 79728844 BLAKE2B 60fa5c1f0149792eadcf4e8d7b944bc597c89b22ecf2a3718d8ed2ca17b87ac5a512910d4835244f1022e0f00ceffca7f4ffd7e3ec630f9feb938c5662227a78 SHA512 0ce56b31358019adfbab43793544616f7e68d44a52e0c2c005ff89f613d0799eceea800147b6b75bb45bc3f7d56286dbea67cff9cff2f867bf196d3e841dd298
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
@@ -55,6 +56,7 @@ EBUILD gcc-12.2.0.ebuild 1482 BLAKE2B 2e6d0e7c9c332e0caa1dcfce636dd4593a8ed65c31
 EBUILD gcc-12.2.1_p20230121-r1.ebuild 1476 BLAKE2B 108f19cabfc3a958c6d61ad2c8ad0955ffc474e9f76ede125dc25c4f94c4d2b692ad9a79b0124657a6d64852cf5beea420d5ec3ecc7ad652573d3fad6f7569cf SHA512 3a8e8b8ef072b6f0f29cc3a2a8215aa97845f4ed84a528eec5de3b61ba2a07628b049029969d64aa86fea60d1e601c3725b16f3f1ab976d17f6695aed418d312
 EBUILD gcc-12.2.1_p20230304.ebuild 1482 BLAKE2B 9d7851775be996df2ec92d8f7745e6d84333cd7b6efa399d1fb7aace8626283ce99b9c8ffa3fe08017fb3ad1cb5bb223a4601e708643e69108e3a60d07048327 SHA512 22c7aea981fc013ba3a418d6042539ffd9bd52acf82be48f4ad5cc39e664a68eff285751724f179cc95bd86cc0f8018b538c1379d0d7ea2673f51081b7c11b3a
 EBUILD gcc-12.2.1_p20230408.ebuild 1486 BLAKE2B dad7755246a60881d0ca2df86aca1a56ac9266559952a1b12d8343fcba847b7ae7cf93f1ce5014f9ee8d391d175d0f7e7c827e05d006d49e26516ce84dab3032 SHA512 0facad7ef93b0037f57085e34699bac31359ad3c70024a9048b267868a1e05b83a86d34f121465ff6267c57a97fa10c55ba36b6f17900f60486f47205d20aa57
+EBUILD gcc-12.2.1_p20230415.ebuild 1486 BLAKE2B dad7755246a60881d0ca2df86aca1a56ac9266559952a1b12d8343fcba847b7ae7cf93f1ce5014f9ee8d391d175d0f7e7c827e05d006d49e26516ce84dab3032 SHA512 0facad7ef93b0037f57085e34699bac31359ad3c70024a9048b267868a1e05b83a86d34f121465ff6267c57a97fa10c55ba36b6f17900f60486f47205d20aa57
 EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 0cac4b67933abbacf0037f3e89b4209ea2a8147b62d4c2b6e61701711ee421d240899c4c9bdb201cdfceef14125227109b4c5c3524256a06b206887a4d0f142e SHA512 ac75c2434ba6a36655749ed371b158360a7e05570ed41e39dac0a15ac6eb24810f2408a2d30e50206e4250c567123377e14317c07ab1e6b5771599a3b5e0ced0
 EBUILD gcc-13.0.1.9999.ebuild 1307 BLAKE2B 71019cdeaf209a3c82cb4c6c2a4d6827f027da17073f359d762cca422b2f67cd127b43b184a26b0d6a3ce5b83d92270b0a5ab6d832c31e28619dec9b5f4fff8a SHA512 5e4faf9e4e1cdb5683c7e66d270910c7f36a6c4504faf3810a562fac93513e20ca9b98dfe7b7a7441c9dffffc01c861609545fc7e36fe7a8081b636adc290dfc
 EBUILD gcc-13.0.1_pre20230409-r1.ebuild 1354 BLAKE2B b1dcf92771940c65b4862f76107df49bdc811c279fa33205cc63d8ed74ceed786712e42a7c050e691a30494b3b55c7bcf62e14d7baa2550c392b7d0bac0007d0 SHA512 4e49f8ea0487bd4cf57a2518647e1dc1f82e1b891a200463f2c17f6285b67070abd1d732ef2c578389a927f142495b3f721a6017f211684b27a3f5ce903cd774
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230415.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230415.ebuild
new file mode 100644
index 000000000000..763aa90c2051
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230415.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="14"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="7"
+MUSL_GCC_VER="12.2.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
+}